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

.idea/shelf/Uncommitted_changes_before_Update_at_2022_4_16_10_41__Default_Changelist_.xml

@@ -1,4 +0,0 @@
-<changelist name="Uncommitted_changes_before_Update_at_2022_4_16_10_41_[Default_Changelist]" date="1650076869924" recycled="true" deleted="true">
-  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_4_16_10_41_[Default_Changelist]/shelved.patch" />
-  <option name="DESCRIPTION" value="Uncommitted changes before Update at 2022/4/16 10:41 [Default Changelist]" />
-</changelist>

src/api/dialysis_record.js

@@ -47,7 +47,7 @@ export function editMonitor(patient_id, schedule_date, data, mode) {
   })
 }
 
-export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_drawing, puncture_nurse_id, start_time, schedual_type, mode, washpipe_nurse, change_nurse, difficult_puncture_nurse, new_fistula_nurse) {
+export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_drawing, puncture_nurse_id, start_time, schedual_type, mode, washpipe_nurse, change_nurse, difficult_puncture_nurse, new_fistula_nurse, blood_drawing) {
   var params = {
     patient_id: patient_id,
     date: schedule_date,
@@ -61,7 +61,8 @@ export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_
     washpipe_nurse: washpipe_nurse,
     change_nurse: change_nurse,
     difficult_puncture_nurse: difficult_puncture_nurse,
-    new_fistula_nurse: new_fistula_nurse
+    new_fistula_nurse: new_fistula_nurse,
+    blood_drawing: blood_drawing
   }
   console.log('params', params)
   return request({

src/api/his/his_hospital.js

@@ -10,3 +10,14 @@ export function upLoadChargeInfo(params) {
   });
 }
 
+
+export function refundDetail(params) {
+  return request({
+    url: "/api/hospital/refunddetail",
+    method: "get",
+    params:params
+  });
+}
+
+
+

src/api/seconde.js

@@ -0,0 +1,97 @@
+import request from '@/utils/request'
+
+export function getSencondeGoodList(params) {
+  return request({
+    url: '/api/seconde/getsencondegoodlist',
+    method: 'get',
+    params: params
+  })
+}
+
+export function saveSencondOrder(data, record_date, storehouse_in_id, storehouse_out_id) {
+  return request({
+    url: '/api/senconde/savesencondorder?record_date=' + record_date + '&storehouse_in_id=' + storehouse_in_id + '&storehouse_out_id=' + storehouse_out_id,
+    method: 'post',
+    data: data
+  })
+}
+
+export function getAllSecondOrderList(params) {
+  return request({
+    url: '/api/senconde/getallsecondeorderlist',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getSencondOrderDetail(id, params) {
+  return request({
+    url: '/api/senconde/getsencondorderdetail?id=' + id,
+    method: 'get',
+    params: params
+  })
+}
+
+export function updateSencondOrder(data, warehousing_time, storehouse_in_id, storehouse_out_id, id) {
+  return request({
+    url: '/api/senconde/updatesencondorder?id=' + id + '&record_date=' + warehousing_time + '&storehouse_in_id=' + storehouse_in_id + '&storehouse_out_id=' + storehouse_out_id,
+    method: 'post',
+    data: data
+  })
+}
+
+export function getSecondOrderDetailList(id, params) {
+  return request({
+    url: '/api/sencond/getsecondorderbyid?id=' + id,
+    method: 'get',
+    params: params
+  })
+}
+
+export function checkSecondOrder(ids, params) {
+  return request({
+    url: '/api/sencond/checksecondorder?ids=' + ids,
+    method: 'get',
+    params: params
+  })
+}
+
+export function deleteStoreHouseList(id, params) {
+  return request({
+    url: '/api/sencond/deletestorehouselist?id=' + id,
+    method: 'get',
+    params: params
+  })
+}
+
+export function returnCheckSecondOrder(ids, params) {
+  return request({
+    url: '/api/sencond/returnchecksecondeorder?ids=' + ids,
+    method: 'get',
+    params: params
+  })
+}
+
+export function getStoreHouseGoodList(params) {
+  return request({
+    url: '/api/second/getstorehousegoodlist',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getSumSecondeCount(params) {
+  return request({
+    url: '/api/second/getsumsecondecount',
+    method: 'get',
+    params: params
+  })
+}
+
+export function deleteSecondeOrderInfo(id, params) {
+  return request({
+    url: '/api/second/deletesecondorderinfo?id=' + id,
+    method: 'get',
+    params: params
+  })
+}

src/api/warehouse.js

@@ -0,0 +1,133 @@
+import request from '@/utils/request'
+
+//分页（已渲染）
+export function storehouselist(params) {
+  return request({
+    url: '/api/secondary/storehouselist',
+    method: 'get',
+    params: params
+  })
+}
+
+//获取当前机构的所有可用仓库名称接口(已渲染)
+export function getallstorehousename(params) {
+  return request({
+    url: '/api/secondary/getallstorehousename',
+    method: 'get',
+    params: params
+  })
+}
+
+//获取一条仓库数据接口(好像用不到了)
+export function getonestorehouse(params) {
+  return request({
+    url: '/api/secondary/getonestorehouse',
+    method: 'get',
+    params: params
+  })
+}
+
+//修改仓库接口(已渲染)
+export function updatestorehouse(data) {
+  return request({
+    url: '/api/secondary/updatestorehouse',
+    method: 'post',
+    data: data
+  })
+}
+
+//添加仓库接口(已渲染)
+export function addstorehouse(data) {
+  return request({
+    url: '/api/secondary/addstorehouse',
+    method: 'post',
+    data: data
+  })
+}
+
+//仓库地址查重接口(合并到新增)
+export function isstorehouseaddress(params) {
+  return request({
+    url: '/api/secondary/isstorehouseaddress',
+    method: 'get',
+    params: params
+  })
+}
+
+//仓库名称查重接口(合并到新增)
+export function isstorehousename(params) {
+  return request({
+    url: '/api/secondary/isstorehousename',
+    method: 'get',
+    params: params
+  })
+}
+
+//删除仓库接口(已渲染)
+export function deletestorehouse(params) {
+  return request({
+    url: '/api/secondary/deletestorehouse',
+    method: 'get',
+    params: params
+  })
+}
+
+//修改仓库状态接口(已渲染)
+export function updatestatus(params) {
+  return request({
+    url: '/api/secondary/updatestatus',
+    method: 'get',
+    params: params
+  })
+}
+
+//获取仓库编号接口(已渲染)
+export function getcode(params) {
+  return request({
+    url: '/api/secondary/getcode',
+    method: 'get',
+    params: params
+  })
+}
+
+//查询该机构的仓库配置(已渲染)
+export function findstorehouseconfig(params) {
+  return request({
+    url: '/api/secondary/findstorehouseconfig',
+    method: 'get',
+    params: params
+  })
+}
+
+//更改耗材自动入库仓库(已渲染)
+export function updateinfo(params) {
+  return request({
+    url: '/api/secondary/updateinfo',
+    method: 'get',
+    params: params
+  })
+}
+//更改耗材自动出库仓库(已渲染)
+export function updateoutinfo(params) {
+  return request({
+    url: '/api/secondary/updateoutinfo',
+    method: 'get',
+    params: params
+  })
+}
+//更改药品自动入库仓库(已渲染)
+export function updatedruginfo(params) {
+  return request({
+    url: '/api/secondary/updatedruginfo',
+    method: 'get',
+    params: params
+  })
+}
+//更改药品自动出库仓库(已渲染)
+export function updatedrugout(params) {
+  return request({
+    url: '/api/secondary/updatedrugout',
+    method: 'get',
+    params: params
+  })
+}

src/lang/en.js

@@ -95,6 +95,8 @@ export default {
     deviceZoneManage: 'Device Zone Manage',
     deviceGroupManage: 'Device Group Manage',
     stockManage: 'Stock Manage',
+    wareHouseManage:'Ware House Manage',
+    inventoryTransfer:'inventoryTransfer',
     supplyManage: 'Supply Manage',
     supplyQuery: 'supply query',
     baseInfo: 'base Info',

src/lang/zh.js

@@ -1,4 +1,5 @@
 export default {
+// 须在src/lang中进行国际化配置
   route: {
     dashboard: '首页',
     introduction: '简述',
@@ -173,6 +174,9 @@ export default {
     selfPreparedMedicineQuery: '自备药查询',
     selfPreparedMedicineIndex: '自备药管理',
     selfPreparedMedicine: '自备药管理',
+    wareHouseManage:'仓库管理',
+    inventoryTransfer:'库存调拨',
+
     consumablesManagement: '耗材管理',
     warehouseReceipt: '出入库',
     warehouseReceiptOther: '出入库',

src/router/index.js

@@ -22,6 +22,8 @@ import slow from './modules/slow'
 import scrm from './modules/scrm'
 import shop from './modules/shop'
 import selfPreparedMedicine from './modules/selfPreparedMedicine'
+import wareHouseManage from './modules/wareHouseManage'
+import inventoryTransfer from './modules/inventoryTransfer'
 import drugs from './modules/drugs'
 import outpatientRegistration from './modules/outpatientRegistration'
 import outpatientDoctorStation from './modules/outpatientDoctorStation'
@@ -149,7 +151,9 @@ var _asy_router_map = [
   dialysis,
   stock,
   drugs,
-  selfPreparedMedicine,
+  selfPreparedMedicine,  //自备药管理模块
+  wareHouseManage,  //仓库管理模块
+  inventoryTransfer,    //库存调拨模块
   otherManagement,
   qcd,
   device,

src/router/modules/inventoryTransfer.js

@@ -0,0 +1,17 @@
+import Layout from '@/views/layout/Layout'
+
+export default {
+  path: '/inventoryTransfer',
+  component: Layout,
+  name:'inventoryTransfer',
+  redirct: 'noredirect',
+  children: [{
+    path: '/stock/inventoryTransfer',
+    component: () => import('@/xt_pages/stock/inventoryTransfer/index.vue'),
+    name: '库存调拨',
+    meta: {
+      title: '库存调拨',
+      noCache: true
+    }
+  },]
+}

src/router/modules/stock.js

@@ -348,6 +348,30 @@ export default {
         title: '退库打印',
         noCache: true
       }
+    },
+
+    {
+      path: '/stock/inventoryTransfer/Addtrans',
+      component: () => import('@/xt_pages/stock/inventoryTransfer/Addtrans'),
+      hidden: true,
+      is_menu: false,
+      name: 'Addtrans',
+      meta: {
+        title: '新增调拨',
+        noCache: true
+      }
+    },
+
+    {
+      path: '/stock/inventoryTransfer/transDetails',
+      component: () => import('@/xt_pages/stock/inventoryTransfer/transDetails'),
+      hidden: true,
+      is_menu: false,
+      name: 'Addtrans',
+      meta: {
+        title: '调拨详情',
+        noCache: true
+      }
     }
   ]
 }

src/router/modules/wareHouseManage.js

@@ -0,0 +1,33 @@
+import Layout from '@/views/layout/Layout'
+
+export default {
+    path: '/stock/wareHouseManage',
+    component: Layout,
+    redirect: 'noredirect',
+    name: 'wareHouseManage',
+    alwaysShow: true,
+    meta: {
+        title: 'wareHouseManage',
+        icon: 'stock',
+        isChild: true
+    },
+    children: [
+        {
+            path: '/stock/warehousequery',
+            component: () => import('@/xt_pages/stock/warehouseManage/query'),
+            name: 'warehousequery',
+            meta: { title: '仓库信息', noCache: true },
+        },
+        {
+            path: '/stock/waresetting',
+            component: () => import('@/xt_pages/stock/warehouseManage/waresetting'),
+            name: 'waresetting',
+            hidden: true,
+            is_menu: false,    
+            meta: { title: '仓库设置', noCache: true },
+        }
+
+    ]
+
+
+}

src/views/layout/Layout.vue

@@ -16,12 +16,10 @@
           <i class="iconfont icon-computer_fill navIcon"></i>
           <p>透析管理</p>
         </div>
-
        <div v-if="caigouShow" :class="index == 5 ? 'navOne navActive' : 'navOne'" @click="clickActive(5,'采购管理')">
          <i class="iconfont icon-kccx navIcon"></i>
          <p>采购管理</p>
       </div>
-
         <div v-if="kucunShow" :class="index == 3 ? 'navOne navActive' : 'navOne'" @click="clickActive(3,'库房管理')">
           <i class="iconfont icon-kccx navIcon"></i>
           <p>库房管理</p>
@@ -132,7 +130,7 @@ export default {
     let menzhen = ['hospitalStation',"hospitalRecord","hospitalCharges","hisTool",'outpatientRegistration','outpatientDoctorStation','outpatientCharges','outpatientPharmacy','outpatientRecord'];
     let bingli = ['User','createPatient'];
     let touxi = ['home','workforce', 'dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'device', 'quality_control'];
-    let kucun = ['stockManage','stockDrugs','selfPreparedMedicine','otherManagement'];
+    let kucun = ['stockManage','stockDrugs','selfPreparedMedicine','inventoryTransfer','wareHouseManage','otherManagement'];
     let caigou = ['supplyManage','supplyList'];
     let peizhi = ['system','roleManage','DepartManage', 'bedManagement', 'dictionaryManagement', 'templateManagement','showconfig','printTemplate','integration_config','basicConfig'];
     let kuyishopping = ['kuyiShopping'];

src/views/layout/components/Sidebar/index.vue

@@ -121,7 +121,7 @@ export default {
             this.$emit('func',a)
           }
         }else if(newVal == '库房管理'){
-          let nameArr = ['stockManage','stockDrugs','selfPreparedMedicine','otherManagement'];
+          let nameArr = ['stockManage','stockDrugs','selfPreparedMedicine','inventoryTransfer','wareHouseManage','otherManagement'];
           let routerArr = [];
           this.permission_routers.map(item => {
             if(nameArr.indexOf(item.name) > -1){

src/xt_pages/dialysis/batch_print/batch_print_order_fortyThree.vue

@@ -912,7 +912,7 @@ export default {
       const style =
         '@media print {.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 20px 20px 20px}.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:25px;font-size:14px}.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;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;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 .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.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; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}'
       const style2 =
-        '@media print {.option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 50px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 14px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;}.print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 3px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-50{margin-bottom:50px;}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top: 1370px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}'
+        '@media print {.option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .print-table{border: none} .print-table tr{page-break-inside:avoid;} .print-table tr td{border: 1px solid #000;}.check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 50px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 14px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;}.print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 3px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-50{margin-bottom:50px;}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top: 1050px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}.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;} .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}';
       const style9 =
         '@media print {#dialysis-print-box-1{margin:0 auto;}.dialysis-print-order{width:920px;margin:0 10px;font-size:10px;}.option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 940px;margin: 0 auto 50px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 14px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;}.print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 3px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-50{margin-bottom:50px;}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top: 1050px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}.table-box1 {border: 1px solid #000;width: 100%;line-height: 30px;font-size: 14px;border-collapse: collapse;} @page {margin-top:5px;}.table-box1 tr {border-bottom: 1px solid #000;}';
       printJS({

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -278,7 +278,7 @@
                             style="width: 100px;text-align: center"
                             v-if="
                               record.assessment_before_dislysis.puncture_way == ''
-                                
+
                             "
                           ></div>
                           <div
@@ -295,7 +295,7 @@
                             style="width: 100px;text-align: center"
                             v-if="
                               record.assessment_before_dislysis.puncture_way.indexOf('扣眼')>-1
-                               
+
                             "
                           >
                             扣眼
@@ -305,7 +305,7 @@
                             style="width: 100px;text-align: center"
                             v-if="
                               record.assessment_before_dislysis.puncture_way.indexOf('区域')>-1
-                                
+
                             "
                           >
                             区域
@@ -330,7 +330,7 @@
                           }}
                         </div>
                       </div>
-                      
+
                     </div>
                     <div
                       class="row"
@@ -348,7 +348,7 @@
                                   .blood_access_part_id
                                 ? record.assessment_before_dislysis
                                     .blood_access_part_id
-                                : 0  
+                                : 0
                           }}
                           {{
                             record.assessment_before_dislysis &&
@@ -679,7 +679,7 @@
                           <span v-else>/</span>
                         </div>
                       </div>
-                      
+
                     </div>
 
                     <div
@@ -704,7 +704,7 @@
                                       .additional_weight
                                 ).toFixed(1)
                               : "未称重"
-                          }}</span>  
+                          }}</span>
                         </div>
                         kg
                       </div>
@@ -1092,7 +1092,7 @@
                           <td></td>
                           <td></td>
                           <td></td>
-                          
+
                           <td style="line-height:16px;padding:0px;">
                             <div
                               style="height:40px;line-height:20px; overflow:hidden;"
@@ -1519,8 +1519,8 @@
                           }}
                         </div>
                       </div>
-                      
-                      
+
+
                     </div>
 
                     <div
@@ -1751,7 +1751,44 @@
                           />
                         </div>
                       </div>
-                      <div class="inline_block" style="flex:1;">
+                     <div class="inline_block" style="flex:1;">
+                      核对人员：
+                       <div
+                          class="under_line"
+                          style="width: 80px;text-align: left"
+                          v-if="!record.check"
+                        ></div>
+                      <div class="under_line" style="width: 80px;text-align: center" v-if="record.check != null && record.dialysis_order == null">
+                        <span style="height: 30px;display: inline-block;" v-if="setAdminUserES(record.check, 'creater') == ''">
+                         {{getAdminUser(record.check, "creater")? getAdminUser(record.check, "creater") : "/" }}
+                        </span>
+                        <img style="height:30px;" :src="setAdminUserES(record.check, 'creater')" alt="" srcset="" v-else />
+                      </div>
+                      <div class="under_line" style="width: 80px;text-align: center" v-if="record.check != null && record.dialysis_order != null && record.dialysis_order.start_nurse == record.check.modifier">
+                        <span style="height: 30px;display: inline-block;" v-if="setAdminUserES(record.check, 'creater') == ''">
+                         {{getAdminUser(record.check, "creater")? getAdminUser(record.check, "creater") : "/" }}
+                        </span>
+                        <img style="height:30px;" :src="setAdminUserES(record.check, 'creater')" alt="" srcset="" v-else />
+                      </div>
+                      <div class="under_line" style="width: 80px;text-align: center" v-if="record.check != null && record.dialysis_order != null && record.dialysis_order.start_nurse == record.check.creater">
+                        <span style="height: 30px;display: inline-block;" v-if="setAdminUserES(record.check, 'modifier') == ''">
+                          {{getAdminUser(record.check, "modifier")? getAdminUser(record.check, "modifier") : "/" }}
+                        </span>
+                        <img style="height:30px;" :src="setAdminUserES(record.check, 'modifier')" alt="" srcset="" v-else />
+                      </div>
+                      <div class="under_line" style="width: 80px;text-align: center" v-if="record.check != null && record.dialysis_order  != null && record.dialysis_order.start_nurse != record.check.creater && record.dialysis_order.start_nurse != record.check.modifier">
+                        <span style="height: 30px;display: inline-block;" v-if="setAdminUserES(record.check, 'creater') == ''">
+                          {{getAdminUser(record.check, "creater")? getAdminUser(record.check, "creater") : "/" }}
+                        </span>
+                        <img style="height:30px;" :src="setAdminUserES(record.check, 'creater')" alt="" srcset="" v-else />
+                      </div>
+                       <div
+                          class="under_line"
+                          style="width: 80px;text-align: left"
+                          v-if="!record.check"
+                        ></div>
+                    </div>
+                      <!-- <div class="inline_block" style="flex:1;">
                         核对人员：
                         <div
                           class="under_line"
@@ -1764,12 +1801,8 @@
                           style="width: 80px;text-align: left"
                         >
                           <div
-                            style="width: 80px;text-align: left;display: inline-block;white-space: nowrap;"
-                            v-if="
-                              record.dialysis_order != null &&
-                                record.dialysis_order.start_nurse ==
-                                  record.check.creater
-                            "
+                            style="width: 80px;text-align: left;display: inline-block;white-space: nowrap;" 
+                            v-if="record.dialysis_order != null && record.check.creater ==record.check.creater"
                           >
                             <span
                               v-if="
@@ -1790,14 +1823,11 @@
                               style="height: 40px;"
                             />
                           </div>
+
                           <div
                             class="under_line"
                             style="width: 80px;text-align: left"
-                            v-if="
-                              record.dialysis_order != null &&
-                                record.dialysis_order.start_nurse ==
-                                  record.check.modifier
-                            "
+                            v-if=" record.dialysis_order != null &&record.dialysis_order.start_nurse ==record.check.modifier "
                           >
                             <span
                               v-if="
@@ -1813,15 +1843,11 @@
                               v-else
                             />
                           </div>
+
                           <div
                             class="under_line"
                             style="width: 80px;text-align: left"
-                            v-if="
-                              record.dialysis_order != null &&
-                                record.dialysis_order.start_nurse !=
-                                  record.check.modifier &&
-                                record.dialysis_order.start_nurse !=
-                                  record.check.creater
+                            v-if="record.dialysis_order != null &&record.dialysis_order.start_nurse != record.check.modifier &&record.dialysis_order.start_nurse != record.check.creater
                             "
                           >
                             <span
@@ -1838,13 +1864,14 @@
                               v-else
                             />
                           </div>
+
                         </div>
                         <div
                           class="under_line"
                           style="width: 80px;text-align: left"
                           v-if="!record.check"
                         ></div>
-                      </div>
+                      </div> -->
                       <div class="inline_block" style="flex:1;">
                         下机护士：
                         <div

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -309,6 +309,16 @@
           >批量打印</el-button
         >
       </template>
+        <template v-if="this.template_id == 47">
+        <el-button
+          size="small"
+          icon="el-icon-printer"
+          :disabled="selecting_schs.length == 0"
+          @click="batchPrintAction"
+          type="primary"
+          >批量打印</el-button
+        >
+      </template>
     </div>
     <div class="app-container">
       <!-- <div class="filter-container">
@@ -942,6 +952,8 @@ export default {
         this.$router.push({ path: "/dialysis/print/batch/fortyOne" });
       } else if (this.template_id == 43) {
         this.$router.push({ path: "/dialysis/print/batch/fortyThree" });
+      } else if (this.template_id == 47) {
+        this.$router.push({ path: "/dialysis/print/batch/fortyThree" });
       }
     },
     batchPrintActionOne: function() {

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -111,8 +111,8 @@
           <label>目标超滤量 : </label>
           <span class="content">{{ target_ultrafiltration != "0" ? target_ultrafiltration : ""}}</span>
           
-          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.org_id != 9555"  class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id != 40 || this.$store.getters.xt_user.template_info.template_id != 43 || this.$store.getters.xt_user.template_info.template_id != 45 || this.$store.getters.xt_user.template_info.org_id == 9555" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 45  && this.$store.getters.xt_user.template_info.template_id != 46  && this.$store.getters.xt_user.template_info.org_id != 9555"  class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id != 40 || this.$store.getters.xt_user.template_info.template_id != 43 || this.$store.getters.xt_user.template_info.template_id != 45 || this.$store.getters.xt_user.template_info.template_id != 46  || this.$store.getters.xt_user.template_info.org_id == 9555" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
         </li>
 
          <li v-if="isShow('目标超滤量') && this.$store.getters.xt_user.template_info.org_id == 10290">

src/xt_pages/dialysis/details/dialog/computer_dialog.vue

@@ -26,7 +26,7 @@
             <el-option v-for="(admin, index) in adminRoles" :key="index" :value="admin.id" :label="admin.name"></el-option>
           </el-select>
         </el-form-item>
-        
+
         <el-form-item label="换药护士"  v-if="isShowFiled('换药护士')">
           <el-select v-model="form.change_nurse" placeholder="换药护士">
             <el-option v-for="(admin, index) in adminRoles" :key="index" :value="admin.id" :label="admin.name"></el-option>
@@ -52,8 +52,8 @@
             </el-select>
         </el-form-item>
 
-     
-        <el-form-item label="引血(ml/min)" v-if="template_id == 6 && org_id != 10223">
+
+        <el-form-item label="引血(ml/min)" v-if="isShowFiled('引血')">
           <el-input type="number" v-model="form.blood_drawing" style="width:200px;"></el-input>
         </el-form-item>
 
@@ -157,13 +157,13 @@
       this.form.nurse_id = this.dialysis_order.id == 0 ? this.$store.getters.xt_user.user.id : this.dialysis_order.start_nurse
       this.form.puncture_nurse_id = this.dialysis_order.id == 0 ? this.$store.getters.xt_user.user.id : this.dialysis_order.puncture_nurse
       this.form.washpipe_nurse = this.dialysis_order.id == 0 ? this.$store.getters.xt_user.user.id : this.dialysis_order.washpipe_nurse
-      
-     
+
+
       if (this.form.puncture_nurse_id == 0) {
         this.form.puncture_nurse_id = this.$store.getters.xt_user.user.id
       }
-      
-     
+
+
     },
     watch: {
       patient:{
@@ -203,7 +203,7 @@
         if(this.admins.length > 0 ){
           for(let i=0;i<this.admins.length;i++){
             this.adminRoles.push(this.admins[i])
-          } 
+          }
         }
         console.log("人员",this.adminRoles)
       }
@@ -245,7 +245,7 @@
         ParamsQuery['record_date'] = this.$route.query.date
         console.log("列表33333333333333333333",ParamsQuery)
         // console.log("路由",this.$route.query.date)
-       
+
         GetSchedualNumber(ParamsQuery).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
@@ -357,8 +357,8 @@
         console.log(this.dialysis_order)
         this.loading = true
         let mode = '1'
-
-        startDialysis(this.patient_id, this.schedule_date ? parseTime(this.schedule_date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}'), this.form.nurse_id, this.form.bed_id, this.form.lood_drawing, this.form.puncture_nurse_id, this.form.start_time, this.schedual_type, mode,this.form.washpipe_nurse,this.form.change_nurse,this.form.difficult_puncture_nurse,this.form.new_fistula_nurse).then(rs => {
+        var blood_drawing =  this.form.blood_drawing.toString()
+        startDialysis(this.patient_id, this.schedule_date ? parseTime(this.schedule_date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}'), this.form.nurse_id, this.form.bed_id, this.form.lood_drawing, this.form.puncture_nurse_id, this.form.start_time, this.schedual_type, mode,this.form.washpipe_nurse,this.form.change_nurse,this.form.difficult_puncture_nurse,this.form.new_fistula_nurse,blood_drawing).then(rs => {
           this.loading = false
           var resp = rs.data
           if (resp.state == 1) {
@@ -371,7 +371,7 @@
             // axios.get('/api/index/uppatient?org_id='+ orgId + '&admin_user_id='+ this.form.nurse_id + '&patient_id=' + this.patient_id + '&up_time=' + (new Date(this.form.start_time).getTime() / 1000)).then((res) => {
             //   console.log('res',res.data)
 
-            // }) 
+            // })
             this.hide()
             this.$emit('monitor', resp.data.monitor)
             this.$message.success('上机成功')
@@ -379,7 +379,8 @@
             this.$message.error(resp.msg)
           }
         })
-      }, editOrder() {
+      },
+      editOrder() {
         let ParamsQuery = {}
         ParamsQuery['schedual_type'] = this.schedual_type
         ParamsQuery['id'] = this.dialysis_order.id
@@ -391,6 +392,7 @@
         ParamsQuery['change_nurse'] = this.form.change_nurse
         ParamsQuery['difficult_puncture_nurse'] = this.form.difficult_puncture_nurse
         ParamsQuery['new_fistula_nurse'] = this.form.new_fistula_nurse
+        ParamsQuery["blood_drawing"] = this.form.blood_drawing
         ParamsQuery['mode'] = "2"
         if (this.dialysis_order.creator != this.$store.getters.xt_user.user.id) {
           ParamsQuery['mode'] = "3"

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -87,7 +87,7 @@
                     </el-col>
 
                     <el-col :span="8"
-                            v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28  || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 ||  this.$store.getters.xt_user.template_info.template_id == 40 ||  this.$store.getters.xt_user.template_info.template_id == 43 ||  this.$store.getters.xt_user.template_info.template_id == 45 || this.$store.getters.xt_user.template_info.org_id == 9555 )">
+                            v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28  || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 ||  this.$store.getters.xt_user.template_info.template_id == 40 ||  this.$store.getters.xt_user.template_info.template_id == 43 ||  this.$store.getters.xt_user.template_info.template_id == 45  ||  this.$store.getters.xt_user.template_info.template_id == 46  || this.$store.getters.xt_user.template_info.org_id == 9555 )">
                         <el-form-item label="目标超滤量(ml)：">
                             <el-input
                                     type="number"
@@ -98,7 +98,7 @@
 
 
                     <el-col :span="8"
-                            v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 43 &&  this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.org_id != 9555 ">
+                            v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 43 &&  this.$store.getters.xt_user.template_info.template_id != 45 &&  this.$store.getters.xt_user.template_info.template_id != 46   && this.$store.getters.xt_user.template_info.org_id != 9555 ">
                         <el-form-item label="目标超滤量(L)：">
                             <el-input
                                     type="number"
@@ -369,7 +369,7 @@
 
 
                     <el-col :span="8"
-                            v-if="isShows('置换量') && (this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 29)"
+                            v-if="isShows('置换量') && (this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 46)"
                             v-show="zhiShow">
                         <el-form-item label="置换量(ml)：">
                             <el-input
@@ -379,7 +379,7 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="8"
-                            v-if="isShows('置换量') && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 40"
+                            v-if="isShows('置换量') && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 46"
                             v-show="zhiShow">
                         <el-form-item label="置换量(L)：">
                             <el-input

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -14,17 +14,17 @@
           <th width="76px">静脉压/动脉压({{monitores[0]&&monitores[0]['venous_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
-          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || this.$store.getters.xt_user.template_info.org_id == 9555)" width="76px" > 超滤量(ml)</th>
-          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44  && this.$store.getters.xt_user.template_info.org_id != 9555"  width="76px"> 超滤量(L) </th>
-          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44)" width="50px"> 超滤率 <br />(ml/h) </th>
-          <th v-if="isShow('超滤率') && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44" width="50px"> 超滤率 <br />(L/h) </th>
+          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || this.$store.getters.xt_user.template_info.org_id == 9555)" width="76px" > 超滤量(ml)</th>
+          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47  && this.$store.getters.xt_user.template_info.org_id != 9555"  width="76px"> 超滤量(L) </th>
+          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47)" width="50px"> 超滤率 <br />(ml/h) </th>
+          <th v-if="isShow('超滤率') && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
-          <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29) " width="92px" > 置换率(ml/min) </th>
-          <th v-if=" isShow('置换率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29" width="92px" > 置换率(L/h)  </th>
+          <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 47) " width="92px" > 置换率(ml/min) </th>
+          <th v-if=" isShow('置换率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 47" width="92px" > 置换率(L/h)  </th>
           <th v-if=" isShow('置换量') && (template_id == 43)" width="92px"> 置换量(ml/h)  </th>
-          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29)" width="92px"  > 置换量(ml)  </th>
-          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29)" width="92px" > 置换量(L) </th>
+          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 47)" width="92px"  > 置换量(ml)  </th>
+          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 47)" width="92px" > 置换量(L) </th>
           <th v-if=" isShow('SpO₂') && template_id != 6 && template_id != 10 && template_id != 11  " width="92px" > SpO₂(%) </th>
           <th v-if="isShow('电导度')" width="92px">电导度(mS/m)</th>
           <th v-if="isShow('置换液流量') && template_id != 27" width="92px">置换液流量(ml/h)</th>

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -978,11 +978,11 @@
             v-if="org_template_info.template_id == 44"
           >
           </DialysisPrintOrderFortyFour>
-          <DialysisPrintOrderFortySeven
+          <DialysisPrintOrderFortyFive
             v-bind:childResponse="childResponse"
             v-if="org_template_info.template_id == 45"
           >
-          </DialysisPrintOrderFortySeven>
+          </DialysisPrintOrderFortyFive>
 
           <DialysisPrintOrderFortySix
             v-bind:childResponse="childResponse"
@@ -1269,7 +1269,8 @@ export default {
       const style =
         '@media print {.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 20px 20px 20px}.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:25px;font-size:14px}.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;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;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 .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.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; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}';
       const style2 =
-        '@media print {.option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 50px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 14px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;}.print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 3px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-50{margin-bottom:50px;}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top: 1050px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}.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;} .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}';
+      // 防止分页错位问题：table设置border: none；.tr设置page-break-inside:avoid; // 防止table数据太多，tr分页错乱 td设置border: 1px solid #000;// 防止部分分页的tr边框线没有
+        '@media print {.option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .print-table{border: none} .print-table tr{page-break-inside:avoid;} .print-table tr td{border: 1px solid #000;}.check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 50px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 14px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;}.print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 3px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-50{margin-bottom:50px;}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top: 1050px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}.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;} .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}';
       const style3 =
         '@media print {.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 20px 20px 20px}.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:25px;font-size:16px;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 #000;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;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 .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.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; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}.row {font-size: 16px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line {display: inline-block;border-bottom: 1px solid #000;text-align: center;white-space: nowrap; width: 50%;}';
       // const style3 =

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1610,7 +1610,7 @@ export default {
           response.data.data.dialysisOrder === null
             ? null
             : response.data.data.dialysisOrder
-
+        console.log("上机233232323232",this.dialysisOrder)
         if (this.operators.length > 0) {
           var operatorsLen = this.operators.length
           for (var index = 0; index < operatorsLen; index++) {

src/xt_pages/hospitalStation/chargeDetailManagement.vue

@@ -95,6 +95,15 @@
             >撤销明细
             </el-button>
 
+
+
+            <el-button
+                v-if="( this.radio == 2 &&this.hisPatientInfo.balance_accounts_type == 2  && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0)"
+                size="small" @click="open(2)" type="primary"
+            >撤销明细
+            </el-button>
+
+
           </div>
           <div v-if="activeName == 'second'">
 
@@ -331,7 +340,7 @@ import charged from './components/charged'
 import medicalInsuranceRefund from './components/medicalInsuranceRefund'
 import additionalCharges from './components/additionalCharges'
 import { getHisHospitalDetailInfo, getHisHospitalDetailList, getMonthHisHospitalDetailInfo } from '@/api/his/his'
-import { upLoadChargeInfo } from '@/api/his/his_hospital'
+import { upLoadChargeInfo,refundDetail } from '@/api/his/his_hospital'
 
 import { uParseTime } from '@/utils/tools'
 
@@ -762,43 +771,65 @@ export default {
             cancelButtonText: '取 消',
             type: 'warning'
           }).then(() => {
-
-            let params = {
-              'settle_accounts_type': settle_accounts_type,
-              'patient_id': that.hisPatientInfo.patient_id,
-              'his_patient_id': that.hisPatientInfo.id,
-              'record_time': that.record_date,
-              'admin_user_id': that.$store.getters.xt_user.user.id
-            }
-            axios.get('http://127.0.0.1:9532/zh/api/refunddetail', {
-              params: params
-            })
-                .then(function(response) {
-                  if (response.data.state == 0) {
-                    that.$message.error(response.data.msg)
-                    that.loadingtwo = false
-                    return false
-                  } else {
-                    if (response.data.data.failed_code == -10) {
-                      // that.$message.error(response.data.data.msg)
-                      that.$confirm(response.data.data.msg, '医保错误信息', {
-                        confirmButtonText: '确 定',
-                        type: 'warning'
-                      }).then(() => {
-
-                      }).catch(() => {
-                      })
+            if (that.hisPatientInfo.balance_accounts_type != 2){
+              let params = {
+                'settle_accounts_type': settle_accounts_type,
+                'patient_id': that.hisPatientInfo.patient_id,
+                'his_patient_id': that.hisPatientInfo.id,
+                'record_time': that.record_date,
+                'admin_user_id': that.$store.getters.xt_user.user.id
+              }
+              axios.get('http://127.0.0.1:9532/zh/api/refunddetail', {
+                params: params
+              })
+                  .then(function(response) {
+                    if (response.data.state == 0) {
+                      that.$message.error(response.data.msg)
+                      that.loadingtwo = false
+                      return false
                     } else {
-                      that.$message.success('撤销明细成功')
-                      that.radio = 1
-                      that.getPatientList()
-                    }
+                      if (response.data.data.failed_code == -10) {
+                        // that.$message.error(response.data.data.msg)
+                        that.$confirm(response.data.data.msg, '医保错误信息', {
+                          confirmButtonText: '确 定',
+                          type: 'warning'
+                        }).then(() => {
+
+                        }).catch(() => {
+                        })
+                      } else {
+                        that.$message.success('撤销明细成功')
+                        that.radio = 1
+                        that.getPatientList()
+                      }
 
-                  }
-                })
-                .catch(function(error) {
-                })
+                    }
+                  })
+                  .catch(function(error) {
+                  })
+
+
+            }else{
+              let params = {
+                'settle_accounts_type': settle_accounts_type,
+                'patient_id': that.hisPatientInfo.patient_id,
+                'his_patient_id': that.hisPatientInfo.id,
+                'record_time': that.record_date,
+                'admin_user_id': that.$store.getters.xt_user.user.id
+              }
+              refundDetail(params).then(response => {
+                if (response.data.state == 0) {
+                  this.loading = false
+                  this.$message.error(response.data.msg)
+                  return false
+                } else {
+                  that.$message.success('撤销明细成功')
+                  that.radio = 1
+                  that.getPatientList()
+                }
+              })
 
+            }
           }).catch(() => {
           })
         } else {
@@ -927,8 +958,6 @@ export default {
               that.changePatientInfo()
             }
           })
-
-
         }
       }
     }, changePatientInfo() {

src/xt_pages/hospitalStation/components/chargeDialog.vue

@@ -20,6 +20,16 @@
         <el-input type="number" v-model="form.private_price" :disabled="true"></el-input>
       </el-form-item>
 
+      <el-form-item label="个账支出：" prop="age" :validate-event="is_Name" style="width:33%;">
+        <el-input type="number" v-model="form.acct_pay" :disabled="true"></el-input>
+      </el-form-item>
+
+
+      <el-form-item label="个人现金支出：" prop="age" :validate-event="is_Name" style="width:33%;">
+        <el-input type="number" v-model="form.psn_pay" :disabled="true"></el-input>
+      </el-form-item>
+
+
 
       <el-form-item label="支付方式：" style="width:100%;">
         <!-- <el-select v-model="form.pay_way" placeholder="请选择">
@@ -82,8 +92,8 @@
     </el-form>
 
     <span slot="footer" class="dialog-footer">
-    <el-button v-loading="loadingtwo" @click="cancel('formValue')">取 消</el-button>
-    <el-button v-loading="loadingtwo" type="primary" @click="confirm('formValue')">确 定</el-button>
+    <el-button @click="cancel('formValue')">取 消</el-button>
+    <el-button type="primary" @click="confirm('formValue')">确 定</el-button>
   </span>
   </el-dialog>
 
@@ -111,7 +121,10 @@
           found_price:'',
           total:0,
           fapiao_code:"",
-          fapiao_number:""
+          fapiao_number:"",
+          order:null,
+          acct_pay:'',
+          psn_pay:'',
 
 
         },
@@ -140,7 +153,9 @@
           reality_price:'',
           found_price:'',
           fapiao_code:"",
-          fapiao_number:""
+          fapiao_number:"",
+          acct_pay:"",
+          psn_pay:"",
         },
 
       }
@@ -167,19 +182,26 @@
     },
     methods: {
       show: function (total,order) {
-        this.total = total;
-        this.form.private_price = total;
-        this.form.pay_price = total;
-        this.form.total = total + this.form.medical_insurance_price;
-        this.form.discount_price = 0.0;
-        this.form.preferential_price = 0.0;
-        this.form.fapiao_code ="";
-        this.form.fapiao_number = "";
-        if(order&&order.id > 0){
-          this.total = order.medfee_sumamt;
-          this.form.private_price = order.medfee_sumamt;
-          this.form.pay_price = order.medfee_sumamt;
+        this.form.total = total
+        this.form.private_price = total
+        this.form.pay_price = total
+        this.form.total = total + this.form.medical_insurance_price
+        this.form.discount_price = 0.0
+        this.form.preferential_price = 0.0
+
+        this.form.fapiao_code =""
+        this.form.fapiao_number = ""
+        this.order = order
+
+        if(this.order && this.order.id > 0){
+          this.form.acct_pay = this.order.acct_pay
+          this.form.psn_pay = this.order.psn_cash_pay
+          this.form.total = this.order.medfee_sumamt
+          this.form.pay_price = this.order.medfee_sumamt
+          this.form.medical_insurance_price = this.order.fund_pay_sumamt
+          this.form.private_price =  this.order.psn_part_amt
         }
+
         this.visibility = true
 
       }, hide: function () {

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -225,7 +225,6 @@
             <span style="color:red;"
                   v-if="dayorMonth == 'month'">{{ getMonthTotal() ? getMonthTotal() : '' }}元</span>
 
-
           </div>
           <span :class="order_status == '未收费' ? 'statusRed' : ''">{{ order_status }}</span>
 
@@ -295,16 +294,24 @@
                               v-if="scope.row.count%scope.row.min_number>0"> {{ scope.row.count % scope.row.min_number }}{{ scope.row.min_unit }}</span>
                         </span>
                         <span v-else> {{ scope.row.total }}{{ scope.row.total ? scope.row.min_unit : '' }}</span> -->
-                       
+
                           <span v-if="scope.row.sum_count/scope.row.min_number>0">{{ Math.floor(scope.row.sum_count / scope.row.min_number) }}{{ scope.row.max_unit }}</span>
                           <span v-if="scope.row.sum_count%scope.row.min_number>0"> {{ scope.row.sum_count % scope.row.min_number }}{{ scope.row.min_unit }}</span>
-                      
+
+                                          <span
+                                              v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10188 || org_id == 10245 || org_id == 9919 || org_id ==10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10191 || org_id == 10278 || org_id == 10217">
+                                              <span
+                                                  v-if="scope.row.count/scope.row.min_number>0">{{ Math.floor(scope.row.count / scope.row.min_number) }}{{ scope.row.max_unit }}</span>
+                                              <span
+                                                  v-if="scope.row.count%scope.row.min_number>0"> {{ scope.row.count % scope.row.min_number }}{{ scope.row.min_unit }}</span>
+                                            </span>
+                        <span v-else> {{ scope.row.total }}{{ scope.row.total ? scope.row.min_unit : '' }}</span>
                       </template>
                     </el-table-column>
                     <el-table-column label="单价" width="40">
                       <template slot-scope="scope">
-                        <span v-if="scope.row.batch_retai_price >0">{{scope.row.batch_retai_price}}</span> 
-                        <span v-else>{{ scope.row.min_price }}</span> 
+                        <span v-if="scope.row.batch_retai_price >0">{{scope.row.batch_retai_price}}</span>
+                        <span v-else>{{ scope.row.min_price }}</span>
                       </template>
                     </el-table-column>
                   </el-table>
@@ -393,6 +400,11 @@
                     </el-table-column>
                     <el-table-column label="库存" width="40">
                       <template slot-scope="scope">
+                                                <span
+                                                    v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id ==10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10191 || org_id == 10278 || org_id == 10217">
+                                                    {{ scope.row.stock_count }}
+                                                </span>
+                        <span v-else> {{ scope.row.total }}</span>
                         <!-- <span
                             v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id ==10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10191 || org_id == 10278">
                             {{ scope.row.stock_count }}
@@ -531,6 +543,7 @@ export default {
   },
   data() {
     return {
+      settle_total:0,
       start_time: moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD'),
       end_time: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
       register: [
@@ -1063,6 +1076,7 @@ export default {
       getDayOrMonthHisPrescription(params).then(response => {
         if (response.data.state == 1) {
           this.month_prescriptions = []
+          this.settle_total = response.data.data.settle_total
 
           if (val == this.end_time) {
             var day_prescription = response.data.data.day_prescription
@@ -1186,6 +1200,8 @@ export default {
       getDayOrMonthHisPrescription(params).then(response => {
         if (response.data.state == 1) {
           this.month_prescriptions = []
+          this.settle_total = response.data.data.settle_total
+
           if (val == this.start_time) {
             var day_prescription = response.data.data.day_prescription
             // this.month_prescriptions = day_prescription
@@ -1553,6 +1569,8 @@ export default {
     }, searchProjectAction() {
       console.log('~~~~')
       console.log(this.allProject)
+      console.log(this.allProject)
+
 
       if (this.search_project_keyword.length == 0) {
         this.tabProject = this.allProject
@@ -1693,27 +1711,27 @@ export default {
 
       return total.toFixed(2)
     }, getMonthTotal() {
-      var total = 0
-      for (let i = 0; i < this.month_prescriptions.length; i++) {
-        if (this.month_prescriptions[i].advices != null) {
-          for (let a = 0; a < this.month_prescriptions[i].advices.length; a++) {
-            total = total.toFixed(2) + (this.month_prescriptions[i].advices[a].retail_price * this.month_prescriptions[i].advices[a].prescribing_number).toFixed(2)
-          }
-        }
-        if (this.month_prescriptions[i].project != null) {
-          for (let b = 0; b < this.month_prescriptions[i].project.length; b++) {
-            total = total.toFixed(2) + (this.month_prescriptions[i].project[b].price * this.month_prescriptions[i].project[b].total).toFixed(2)
-          }
-        }
-
-        if (this.month_prescriptions[i].addition != null) {
-          for (let b = 0; b < this.month_prescriptions[i].addition.length; b++) {
-            total = total + this.month_prescriptions[i].addition[b].price * this.month_prescriptions[i].addition[b].count
-          }
-        }
-      }
-
-      return total.toFixed(2)
+      // var total = 0
+      // for (let i = 0; i < this.month_prescriptions.length; i++) {
+      //   if (this.month_prescriptions[i].advices != null) {
+      //     for (let a = 0; a < this.month_prescriptions[i].advices.length; a++) {
+      //       total = total + (this.month_prescriptions[i].advices[a].retail_price* this.month_prescriptions[i].advices[a].prescribing_number)
+      //     }
+      //   }
+      //   if (this.month_prescriptions[i].project != null) {
+      //     for (let b = 0; b < this.month_prescriptions[i].project.length; b++) {
+      //       total = total+ (this.month_prescriptions[i].project[b].price * this.month_prescriptions[i].project[b].total)
+      //     }
+      //   }
+      //
+      //   if (this.month_prescriptions[i].addition != null) {
+      //     for (let b = 0; b < this.month_prescriptions[i].addition.length; b++) {
+      //       total = total + this.month_prescriptions[i].addition[b].price * this.month_prescriptions[i].addition[b].count
+      //     }
+      //   }
+      // }
+      console.log("~~~~~~"+this.settle_total)
+      return this.settle_total
     },
     createFilter(queryString) {
       return (restaurant) => {
@@ -2030,7 +2048,9 @@ export default {
       }
 
     },
-    setMonthData(info, admin_info, doctors, department, hisPatientInfo, month_data, last_info) {
+    setMonthData(info, admin_info, doctors, department, hisPatientInfo, month_data, last_info,settle_total) {
+
+
       this.curMonthPrescriptions = {}
       this.curPrescriptions = {}
 
@@ -2134,6 +2154,8 @@ export default {
         this.curMonthPrescriptions = month_data[1]
       }
 
+      this.settle_total = settle_total
+
     },
 
     moreState(tab, event) {
@@ -2676,6 +2698,8 @@ export default {
     },
     selectDrugs(selection, row) {
         if (row.sum_count <= 0) {
+      if (this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id == 10088 || this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10191 || this.org_id == 10278 || this.org_id == 10217) {
+        if (row.count <= 0) {
           if (selection) {
             selection.forEach(row => {
               if (row.count <= 0) {
@@ -2981,11 +3005,23 @@ export default {
               this.$refs.tables.toggleRowSelection(row)
             }else{
                this.$refs.tables.clearSelection()
+      console.log('row', row)
+      if (this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id == 10088 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 10188  || this.org_id == 9956 || this.org_id == 10191 || this.org_id == 10278 || this.org_id == 10217) {
+        if (row.stock_count <= 0) {
+          if (row.type == 3) {
+            if (selection) {
+              selection.forEach(row => {
+                if (row.stock_count <= 0) {
+                  this.$refs.tables.toggleRowSelection(row)
+                }
+              })
+            } else {
+              this.$refs.tables.clearSelection()
             }
              this.$message.error(row.project_name + '库存不足')
              return
           })
-       }  
+       }
       }
       // if (this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id == 10088 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 10188  || this.org_id == 9956 || this.org_id == 10191 || this.org_id == 10278) {
       //   if (row.stock_count <= 0) {
@@ -3057,6 +3093,10 @@ export default {
 
           for (let i = 0; i < good_info.length; i++) {
             good_info[i].stock_count = 0
+            if (good_info[i].good_stock_in&&good_info[i].good_stock_in.length > 0) {
+              for (let j = 0; j < good_info[i].good_stock_in.length; j++) {
+                good_info[i].stock_count += good_info[i].good_stock_in[j].stock_count
+              }
             if(good_info[i].batch_retai_price > 0){
               good_info[i].packing_price = 0
               good_info[i].packing_price = good_info[i].batch_retai_price
@@ -3086,6 +3126,9 @@ export default {
 
           this.allProject = this.tabProject
 
+
+
+
         }
       })
 

src/xt_pages/hospitalStation/components/settlePrescriptionTable.vue

@@ -18,31 +18,26 @@
         width="40"
         label="序号"
       ></el-table-column>
-      <el-table-column align="center" prop="name" label="名称">
+      <el-table-column align="center" prop="name" width="400" label="名称">
         <template slot-scope="scope"
           ><span :title="scope.row.drug_name">{{
             scope.row.drug_name
           }}</span></template
         >
       </el-table-column>
-
-      <el-table-column align="center" prop="name" width="90" label="单次用量">
+      <el-table-column align="center" prop="name" width="80" label="单次用量">
         <template slot-scope="scope">
-          <!--<el-input v-model="scope.row.single_dose" readonly style="width:65%;"></el-input>-->
-          <div>
-            {{ scope.row.single_dose }}&nbsp;&nbsp;{{
-              scope.row.single_dose_unit
-            }}
-          </div>
+          <!--<el-input v-model="scope.row.delivery_way" readonly></el-input>-->
+          <div>{{ scope.row.single_dose }}{{ scope.row.single_dose_unit }}</div>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" width="100" label="用法">
+      <el-table-column align="center" prop="name" width="80" label="用法">
         <template slot-scope="scope">
           <!--<el-input v-model="scope.row.delivery_way" readonly></el-input>-->
           <div>{{ scope.row.delivery_way }}</div>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" width="100" label="频率">
+      <el-table-column align="center" prop="name" width="80" label="频率">
         <template slot-scope="scope">
           <div>{{ scope.row.execution_frequency }}</div>
 
@@ -50,28 +45,25 @@
         </template>
       </el-table-column>
 
-      <el-table-column align="center" prop="day" width="50" label="天数">
+      <el-table-column align="center" prop="day" width="80" label="天数">
         <template slot-scope="scope">{{ scope.row.day }}天</template>
       </el-table-column>
 
-      <el-table-column align="center" prop="name" width="100" label="总量">
-        <template slot-scope="scope">
-          <!--<el-input v-model="scope.row.prescribing_number" style="width:60%" readonly placeholder=""></el-input>-->
-          <div>
-            {{ scope.row.prescribing_number }}&nbsp;&nbsp;{{
-              scope.row.prescribing_number_unit
-            }}
-          </div>
-        </template>
+      <el-table-column align="center" prop="name" width="80" label="总量">
+        <template slot-scope="scope"
+          >{{ scope.row.prescribing_number
+          }}{{ scope.row.prescribing_number_unit }}</template
+        >
       </el-table-column>
-      <el-table-column align="center" prop="name" width="60" label="单价">
+      <el-table-column align="center" prop="name" width="100" label="单价">
         <template slot-scope="scope">
           <div>{{ scope.row.retail_price }}元</div>
 
           <!--<el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>-->
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" width="60" label="总价">
+
+      <el-table-column align="center" prop="name" width="100" label="总价">
         <template slot-scope="scope">
           <div>
             {{
@@ -85,13 +77,13 @@
         </template>
       </el-table-column>
 
-      <el-table-column align="center" prop="name" width="60" label="全自费金额">
+      <el-table-column align="center" prop="name" width="80" label="全自费金额">
         <template slot-scope="scope">
           <div>{{ scope.row.fulamt_ownpay_amt }}元</div>
         </template>
       </el-table-column>
 
-      <el-table-column align="center" prop="name" width="60" label="超限价金额">
+      <el-table-column align="center" prop="name" width="80" label="超限价金额">
         <template slot-scope="scope">
           <div>{{ scope.row.overlmt_amt }}元</div>
         </template>
@@ -100,7 +92,7 @@
       <el-table-column
         align="center"
         prop="name"
-        width="60"
+        width="80"
         label="先行自付金额"
       >
         <template slot-scope="scope">
@@ -111,7 +103,7 @@
       <el-table-column
         align="center"
         prop="name"
-        width="60"
+        width="70"
         label="符合正常范围金额"
       >
         <template slot-scope="scope">
@@ -119,7 +111,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column align="center" prop="name" width="50" label="备注">
+      <el-table-column align="center" prop="name" width="60" label="备注">
         <template slot-scope="scope">
           <!--<el-input v-model="scope.row.remark" :title="scope.row.remark" placeholder="" readonly></el-input>-->
           <div>{{ scope.row.remark }}</div>
@@ -144,7 +136,12 @@
         width="40"
         label="序号"
       ></el-table-column>
-      <el-table-column align="center" prop="project_name" label="名称">
+      <el-table-column
+        align="center"
+        prop="project_name"
+        width="400"
+        label="名称"
+      >
         <template slot-scope="scope">{{ scope.row.project_name }}</template>
       </el-table-column>
       <el-table-column
@@ -157,15 +154,17 @@
           getGroup(scope.row.statistical_classification)
         }}</template>
       </el-table-column>
+
       <el-table-column
         align="center"
         prop="single_dose"
         width="80"
         label="单次用量"
       >
-        <template slot-scope="scope"
-          >{{ scope.row.single_dose }}{{ scope.row.unit }}</template
-        >
+        <template slot-scope="scope">
+          <!--<el-input v-model="scope.row.delivery_way" placeholder="" readonly></el-input>-->
+          {{ scope.row.single_dose }}{{ scope.row.unit }}
+        </template>
       </el-table-column>
       <el-table-column
         align="center"
@@ -192,7 +191,7 @@
       <el-table-column
         align="center"
         prop="number_days"
-        width="50"
+        width="80"
         label="天数"
       >
         <template slot-scope="scope">
@@ -200,36 +199,35 @@
           {{ scope.row.number_days }}天
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="total" width="50" label="总量">
+
+      <el-table-column align="center" prop="total" width="80" label="总量">
         <template slot-scope="scope">
-          <div style="display: flex">
-            <!--<el-input v-model="scope.row.total" placeholder="" readonly></el-input>-->
-            {{ scope.row.total }} {{ scope.row.unit }}
-          </div>
+          <!--<el-input v-model="scope.row.total" placeholder="" readonly></el-input>-->
+          {{ scope.row.total }} {{ scope.row.unit }}
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" width="50" label="单价">
+
+      <el-table-column align="center" prop="name" width="100" label="单价">
         <template slot-scope="scope">
           <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
           {{ scope.row.price }}元
         </template>
       </el-table-column>
 
-      <el-table-column align="center" prop="name" width="60" label="总价">
+       <el-table-column align="center" prop="name" width="100" label="总价">
         <template slot-scope="scope">
-          <div>{{ (scope.row.total * scope.row.price).toFixed(2) }}元</div>
-
           <!--<el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>-->
+          {{ (scope.row.total * scope.row.price).toFixed(2) }}元
         </template>
       </el-table-column>
 
-      <el-table-column align="center" prop="name" width="60" label="全自费金额">
+      <el-table-column align="center" prop="name" width="80" label="全自费金额">
         <template slot-scope="scope">
           <div>{{ scope.row.fulamt_ownpay_amt }}元</div>
         </template>
       </el-table-column>
 
-      <el-table-column align="center" prop="name" width="60" label="超限价金额">
+      <el-table-column align="center" prop="name" width="80" label="超限价金额">
         <template slot-scope="scope">
           <div>{{ scope.row.overlmt_amt }}元</div>
         </template>
@@ -238,7 +236,7 @@
       <el-table-column
         align="center"
         prop="name"
-        width="60"
+        width="80"
         label="先行自付金额"
       >
         <template slot-scope="scope">
@@ -249,7 +247,7 @@
       <el-table-column
         align="center"
         prop="name"
-        width="60"
+        width="70"
         label="符合正常范围金额"
       >
         <template slot-scope="scope">

src/xt_pages/hospitalStation/doctorDesk.vue

@@ -321,6 +321,7 @@
     },
     data() {
       return {
+        settle_total:0,
         current_data:null,
         drugs: [],
         allDrugs: [],
@@ -821,7 +822,7 @@
         this.month_prescriptions.push(p2)
 
 
-        this.$refs.prescriptions.setMonthData(this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info)
+        this.$refs.prescriptions.setMonthData(this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info,this.settle_total)
 
       },
 
@@ -3287,6 +3288,8 @@
                   this.hisPatientInfo = response.data.data.his_info
                   this.case_history = response.data.data.case_history
                   var month_prescriptions = response.data.data.month_prescriptions
+                  this.settle_total = response.data.data.settle_total
+                  console.log(this.settle_total)
                   this.setMonthPrescription(month_prescriptions)
                   this.doctors = response.data.data.doctors
                   this.department = response.data.data.department
@@ -3342,7 +3345,7 @@
                   } else {
                     this.case_history.is_infect = false
                   }
-                  this.$refs.prescriptions.setMonthData(this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info)
+                  this.$refs.prescriptions.setMonthData(this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info,this.settle_total)
                 }
               })
             }
@@ -3710,6 +3713,8 @@
 
                   this.month_prescriptions = []
 
+                  this.settle_total = response.data.data.settle_total
+
                   var month_prescriptions = response.data.data.month_prescriptions
                   this.setMonthPrescription(month_prescriptions)
 
@@ -3768,7 +3773,7 @@
                   } else {
                     this.case_history.is_infect = false
                   }
-                  this.$refs.prescriptions.setMonthData(this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info)
+                  this.$refs.prescriptions.setMonthData(this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info,this.settle_total)
                 }
               })
 
@@ -4083,6 +4088,8 @@
 
             this.doctors = response.data.data.doctors
             this.department = response.data.data.department
+            this.settle_total = response.data.data.settle_total
+
 
             for (let i = 0; i < this.doctors.length; i++) {
               if (this.doctors[i].user_type == 1) {
@@ -4133,7 +4140,7 @@
               this.case_history.is_infect = false
             }
 
-            this.$refs.prescriptions.setMonthData(this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info)
+            this.$refs.prescriptions.setMonthData(this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info,this.settle_total)
           }
         })
 

src/xt_pages/hospitalStation/invoiceTemplate/printTwo.vue

@@ -6,14 +6,14 @@
         </div>
         <div style="display:flex;justify-content: space-between;">
             <!-- <div>{{ list.department_name }}</div> -->
-            <div  style="position: absolute;top:50px;left:260px">{{ list.his_hospital_record.id_card_no }}</div>
+            <div  style="position: absolute;top:50px;left:260px">{{ list.his_hospital_record.id_card_no?list.order.certno:''}}</div>
             <div></div>
         </div>
         <div style="display:flex;justify-content: space-between;">
             <!-- <div>{{ list.department_name }}</div> -->
             <div  style="position: absolute;top:70px;left:90px">门诊</div>
             <div></div>
-            <div  style="position: absolute;top:70px;left:240px">{{ list.his_hospital_record.number }}</div>
+            <div  style="position: absolute;top:70px;left:240px">{{ list.his_hospital_record.number?list.order.mdtrt_id:''}}</div>
             <div  style="position: absolute;left:470px;top:70px;">
                 <span>{{  paramsObj.setl_time ? paramsObj.setl_time.split(' ')[0].slice(0,4) : getTime(list.date, '{y}-{m}-{d}').slice(0,4) }}</span>
             </div>

src/xt_pages/hospitalStation/outpatientChargesManagement.vue

@@ -112,14 +112,14 @@
             </el-button>
 
             <el-button v-loading="loadingtwo"
-                       v-if="(this.activeName == 'third' &&this.hisPatientInfo.balance_accounts_type != 2 &&  this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 1) || (this.activeName != 'first' &&this.hisPatientInfo.balance_accounts_type != 2 &&  this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 1 && this.order.order_status == 1) ||   (this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 1 && this.order.order_status == 3)"
+                       v-if="(this.radio == 1 && this.activeName == 'third' &&this.hisPatientInfo.balance_accounts_type != 2 &&  this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 1) || (this.activeName != 'first' &&this.hisPatientInfo.balance_accounts_type != 2 &&  this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 1 && this.order.order_status == 1) ||   (this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 1 && this.order.order_status == 3)"
                        size="small"
                        @click="open(3)"
                        type="primary">收费
             </el-button>
 
             <el-button v-loading="loadingtwo"
-                       v-if="(this.activeName == 'third' &&this.hisPatientInfo.balance_accounts_type == 2 && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 1  && this.order.order_status != 2)"
+                       v-if="(this.radio == 1 &&this.activeName == 'third' &&this.hisPatientInfo.balance_accounts_type == 2 && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 1  && this.order.order_status != 2)"
                        size="small"
                        @click="open(3)"
                        type="primary">收费
@@ -175,7 +175,7 @@
                   <div class="costBox">
                     <span>当前处方总费用：<span style="color:red;">{{ settle_total }}元</span></span>
                     <span>医疗费总额：<span style="color:red;">{{
-                        order.medfee_sumamt ? order.medfee_sumamt.toFixed(2) : getSettleTotal() ? getSettleTotal() : ''
+                        order.medfee_sumamt ? order.medfee_sumamt.toFixed(2) : settle_total ? settle_total : ''
                       }}元</span></span>
                     <span>基金支付总额：<span
                         style="color:red;">{{
@@ -232,7 +232,6 @@
         :visible.sync="statementVisible">
       <statementPrint ref="print" :paramsObj='orderObj'></statementPrint>
     </el-dialog>
-
     <el-dialog
         class="centerDialog"
         width="1200px"
@@ -248,7 +247,6 @@
         :visible.sync="invoiceVisible">
       <invoice-print ref="print" :invoiceParams='invoiceParams'></invoice-print>
     </el-dialog>
-
     <el-dialog
         title="出院时间"
         :visible.sync="dialogVisible"
@@ -1105,20 +1103,6 @@ export default {
         }
       }
 
-    },
-    tabclickEventTwo(val) {
-      for (let i = 0; i < this.month_prescriptions.length; i++) {
-        if (this.month_prescriptions[i].name == val.name) {
-
-          this.curMonthPrescriptions = {}
-          var temp = this.deepClone(this.month_prescriptions[i])
-          this.curMonthPrescriptions = temp
-        }
-      }
-      this.prescription_id = this.month_prescriptions.id
-      this.month_total = 0
-      this.month_total = this.getMonthTotalOne()
-
     },
     tabclickEventThree(val) {
       for (let i = 0; i < this.settle_prescriptions.length; i++) {
@@ -1129,27 +1113,12 @@ export default {
           this.curSettlePrescriptions = temp
         }
       }
-      this.prescription_id = this.settle_prescriptions.id
-      this.settle_total = 0
-      this.settle_total = this.getSettleTotalOne()
+      // this.prescription_id = this.settle_prescriptions.id
+      // this.settle_total = 0
+      // this.settle_total = this.getSettleTotalOne()
 
     },
-    tabclickEvent(val) {
-      console.log('val', val.name)
-      for (let i = 0; i < this.prescriptions.length; i++) {
-        if (this.prescriptions[i].name == val.name) {
-
-          this.curPrescriptions = {}
-          var temp = this.deepClone(this.prescriptions[i])
-          this.curPrescriptions = temp
-        }
-      }
-      console.log('9999', this.curPrescriptions)
-      this.prescription_id = this.curPrescriptions.id
-      this.total = 0
-      this.total = this.getTotalOne()
 
-    },
     deepClone(source) {
       if (!source && typeof source !== 'object') {
         throw new Error('error arguments', 'shallowClone')
@@ -1169,7 +1138,7 @@ export default {
       if (this.curPrescriptions.type == 1) {
         if (this.curPrescriptions.advices != null) {
           for (let a = 0; a < this.curPrescriptions.advices.length; a++) {
-            total = parseFloat(total) + parseFloat(this.curPrescriptions.advices[a].retail_price * this.curPrescriptions.advices[a].prescribing_number)
+            total = parseFloat(total) + parseFloat(this.curPrescriptions.advices[a].retail_price  * this.curPrescriptions.advices[a].prescribing_number)
 
           }
         }
@@ -1190,14 +1159,14 @@ export default {
       if (this.curMonthPrescriptions.type == 1) {
         if (this.curMonthPrescriptions.advices != null) {
           for (let a = 0; a < this.curMonthPrescriptions.advices.length; a++) {
-            total = parseFloat(total) + parseFloat(this.curMonthPrescriptions.advices[a].retail_price * this.curMonthPrescriptions.advices[a].prescribing_number)
+            total = parseFloat(total) + parseFloat(this.curMonthPrescriptions.advices[a].retail_price* this.curMonthPrescriptions.advices[a].prescribing_number)
 
           }
         }
       } else {
         if (this.curMonthPrescriptions.project != null) {
           for (let b = 0; b < this.curMonthPrescriptions.project.length; b++) {
-            total = parseFloat(total) + parseFloat(this.curMonthPrescriptions.project[b].price * this.curMonthPrescriptions.project[b].total)
+            total = parseFloat(total) + parseFloat(this.curMonthPrescriptions.project[b].price  * this.curMonthPrescriptions.project[b].total)
 
           }
         }
@@ -1211,39 +1180,45 @@ export default {
       if (this.curSettlePrescriptions.type == 1) {
         if (this.curSettlePrescriptions.advices != null) {
           for (let a = 0; a < this.curSettlePrescriptions.advices.length; a++) {
-            total = parseFloat(total) + parseFloat(this.curSettlePrescriptions.advices[a].retail_price * this.curSettlePrescriptions.advices[a].prescribing_number)
+            total = parseFloat(total) + (this.curSettlePrescriptions.advices[a].retail_price * this.curSettlePrescriptions.advices[a].prescribing_number).toFixed(2)
 
           }
         }
       } else {
         if (this.curSettlePrescriptions.project != null) {
           for (let b = 0; b < this.curSettlePrescriptions.project.length; b++) {
-            total = parseFloat(total) + parseFloat(this.curSettlePrescriptions.project[b].price * this.curSettlePrescriptions.project[b].total)
+            total = parseFloat(total) + (this.curSettlePrescriptions.project[b].price   * this.curSettlePrescriptions.project[b].total).toFixed(2)
 
           }
         }
       }
 
-      return total.toFixed(2)
+      return total
 
     },
     getSettleTotal() {
-      var total = 0
+      var total = 0.0
       for (let i = 0; i < this.settle_prescriptions.length; i++) {
         if (this.settle_prescriptions[i].advices != null) {
           for (let a = 0; a < this.settle_prescriptions[i].advices.length; a++) {
-            total = parseFloat(total) + parseFloat(this.settle_prescriptions[i].advices[a].retail_price * this.settle_prescriptions[i].advices[a].prescribing_number)
+            // console.log(parseFloat(this.settle_prescriptions[i].advices[a].retail_price.toFixed(2)))
+            // console.log(this.settle_prescriptions[i].advices[a].prescribing_number)
+            total = parseFloat(total) + (parseFloat(this.settle_prescriptions[i].advices[a].retail_price.toString()) * parseFloat(this.settle_prescriptions[i].advices[a].prescribing_number.toString())).toFixed(2)
+
+            // console.log(parseFloat(this.settle_prescriptions[i].advices[a].retail_price.toFixed(2) * this.settle_prescriptions[i].advices[a].prescribing_number))
+            // total = parseFloat(total) + parseFloat(this.settle_prescriptions[i].advices[a].retail_price).toFixed(2) * this.settle_prescriptions[i].advices[a].prescribing_number
           }
         }
         if (this.settle_prescriptions[i].project != null) {
           for (let b = 0; b < this.settle_prescriptions[i].project.length; b++) {
+            total = parseFloat(total) + (parseFloat(this.settle_prescriptions[i].project[b].price.toString())  * parseFloat(this.settle_prescriptions[i].project[b].total.toString())).toFixed(2)
 
-            total = parseFloat(total) + parseFloat(this.settle_prescriptions[i].project[b].price * this.settle_prescriptions[i].project[b].total)
+            // total = parseFloat(total) + parseFloat(this.settle_prescriptions[i].project[b].price.toFixed(2))* this.settle_prescriptions[i].project[b].total
           }
         }
 
       }
-      return total.toFixed(2)
+      return total
 
     },
     getTotal() {
@@ -1257,7 +1232,7 @@ export default {
         if (this.prescriptions[i].project != null) {
           for (let b = 0; b < this.prescriptions[i].project.length; b++) {
 
-            total = parseFloat(total) + parseFloat(this.prescriptions[i].project[b].price * this.prescriptions[i].project[b].total)
+            total = parseFloat(total) + parseFloat(this.prescriptions[i].project[b].price  * this.prescriptions[i].project[b].total)
           }
         }
 
@@ -1276,7 +1251,7 @@ export default {
         if (this.month_prescriptions[i].project != null) {
           for (let a = 0; a < this.month_prescriptions[i].project.length; a++) {
 
-            total = parseFloat(total) + parseFloat(this.month_prescriptions[i].project[a].price * this.month_prescriptions[i].project[a].total)
+            total = parseFloat(total) + parseFloat(this.month_prescriptions[i].project[a].price  * this.month_prescriptions[i].project[a].total)
           }
         }
 
@@ -1448,8 +1423,8 @@ export default {
           this.$message.error('请先到医生工作站开处方再来结算')
           return
         }
-
-        this.$refs.charge.show(this.getSettleTotal(),this.order)
+        console.log(this.order)
+        this.$refs.charge.show(this.settle_total,this.order)
 
       } else if (index == 4) {
         if (this.hisPatientInfo.balance_accounts_type == 2) {
@@ -2637,7 +2612,113 @@ export default {
 
       this.curMonthPrescriptions = this.month_prescriptions[0]
 
+
     },
+    setSettlePrescriptionTwo(month_prescriptions) {
+      this.settle_prescriptions = []
+
+      for (let i = 0; i < month_prescriptions.length; i++) {
+        var prescription = month_prescriptions[i]
+        let tempAdvice = []
+        let tempProject = []
+        let tempAddition = []
+        for (let b = 0; b < prescription.advices.length; b++) {
+          let spec = prescription.advices[b].drug.dose + prescription.advices[b].drug.dose_unit + '*' + prescription.advices[b].drug.min_number + prescription.advices[b].drug.min_unit + '/' + prescription.advices[b].drug.max_unit
+
+          let obj = {
+            advice_id: prescription.advices[b].id,
+            drug_name: prescription.advices[b].advice_name,
+            single_dose: prescription.advices[b].single_dose,
+            delivery_way: prescription.advices[b].delivery_way,
+            execution_frequency: prescription.advices[b].execution_frequency,
+            retail_price: prescription.advices[b].price.toString(),
+            remark: prescription.advices[b].remark,
+            day: prescription.advices[b].day,
+            prescribing_number: prescription.advices[b].prescribing_number.toString(),
+            single_dose_unit: prescription.advices[b].single_dose_unit,
+            prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
+            medical_insurance_number: prescription.advices[b].med_list_codg,
+
+            code: prescription.advices[b].drug.medical_insurance_number,
+            spec: spec,
+            det_item_fee_sumamt: prescription.advices[b].order_info.det_item_fee_sumamt,
+            name_id: prescription.advices[b].drug.manufacturer,
+            fulamt_ownpay_amt: prescription.advices[b].order_info.fulamt_ownpay_amt,
+            overlmt_amt: prescription.advices[b].order_info.overlmt_amt,
+            preselfpay_amt: prescription.advices[b].order_info.preselfpay_amt,
+            inscp_scp_amt: prescription.advices[b].order_info.inscp_scp_amt
+
+
+
+          }
+          tempAdvice.push(obj)
+        }
+
+        for (let b = 0; b < prescription.project.length; b++) {
+          let obj = {
+            id: prescription.project[b].id,
+            project_id: prescription.project[b].project.id,
+            // project_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,
+            number_days: prescription.project[b].day,
+            total: prescription.project[b].count.toString(),
+            price: prescription.project[b].price,
+            remark: prescription.project[b].remark,
+            // medical_code: prescription.project[b].project.medical_code,
+            unit: prescription.project[b].project.unit,
+            type: prescription.project[b].type,
+            det_item_fee_sumamt: prescription.project[b].order_info.det_item_fee_sumamt,
+            fulamt_ownpay_amt: prescription.project[b].order_info.fulamt_ownpay_amt,
+            overlmt_amt: prescription.project[b].order_info.overlmt_amt,
+            preselfpay_amt: prescription.project[b].order_info.preselfpay_amt,
+            inscp_scp_amt: prescription.project[b].order_info.inscp_scp_amt
+
+          }
+
+          if (prescription.project[b].type == 2) {
+            obj['statistical_classification'] = prescription.project[b].team.project_team
+            obj['medical_code'] = prescription.project[b].project.medical_code
+            obj['project_name'] = prescription.project[b].project.project_name
+            obj['spec'] = ''
+            obj['name_id'] = 0
+
+          } else if (prescription.project[b].type == 3) {
+            obj['statistical_classification'] = prescription.project[b].team.project_team
+            obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
+            obj['project_name'] = prescription.project[b].good_info.good_name
+            obj['spec'] = prescription.project[b].good_info.specification_name
+            obj['name_id'] = prescription.project[b].good_info.manufacturer
+
+          }
+
+          tempProject.push(obj)
+        }
+
+        let index = i + 1
+        let obj = {
+          id: prescription.id,
+          name: '处方' + index,
+          advices: tempAdvice,
+          project: tempProject,
+          addition: tempAddition,
+          order_status: prescription.order_status,
+          type: prescription.type
+        }
+        this.settle_prescriptions.push(obj)
+        this.curSettlePrescriptions = this.settle_prescriptions[0]
+        for (let i = 0; i < this.settle_prescriptions.length; i++) {
+          if (this.settle_prescriptions[i].order_status != 4) {
+            this.isShowUpload = 2
+          }
+
+        }
+
+      }
+    },
+
     setSettlePrescription(month_prescriptions) {
       this.settle_prescriptions = []
 
@@ -2818,6 +2899,7 @@ export default {
       return arr.filter((arr) => !res.has(arr.id_card_no) && res.set(arr.id_card_no, 1))
     },
     handleCurrentChange(val) {
+      console.log(val)
       this.curPrescriptions = {}
       this.curMonthPrescriptions = {}
       this.prescriptions = []
@@ -3026,10 +3108,10 @@ export default {
           } else {
             this.curMonthPrescriptions = {}
           }
-          this.total = 0
+          // this.total = 0
           this.total = this.getTotalOne()
-          this.month_total = this.getMonthTotalOne()
-          this.settle_total = this.getSettleTotalOne()
+          // this.month_total = this.getMonthTotalOne()
+          this.settle_total = response.data.data.settle_total
 
         }
       })

src/xt_pages/hospitalStation/statementTemplate/printOne.vue

@@ -93,7 +93,7 @@
         <td>出院日期</td>
         <td width="100">{{info.enddate}}</td>
         <td>住院天数</td>
-        <td>{{getDay(info.begndate,info.enddate) + 1}}</td>
+        <td>{{getDay(info.begndate,info.enddate)}}</td>
 
       </tr>
       <tr>
@@ -129,6 +129,7 @@
         <td colspan="12" style="text-align:left;padding-left:10px;">
           本次就医：总费用{{info.medfee_sumamt}}元，基金支付{{info.fund_pay_sumamt}}元，个人支付{{info.psn_pay}}元。
           (起付线 {{info.act_pay_dedc}}元, 先自付 {{info.preselfpay_amt}}元, 段内自付 {{(info.psn_pay - info.preselfpay_amt).toFixed(2)}} )
+
         </td>
       </tr>
       <tr>
@@ -356,7 +357,7 @@
             return 1;
           }
           var days=(endDate - startDate)/(1*24*60*60*1000);
-          return  days;
+          return  days+1;
 
         },
       getNowTime: function () {

src/xt_pages/hospitalStation/statementTemplate/printOther.vue

@@ -0,0 +1,386 @@
+<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" 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="100" v-else></td>
+
+      </tr>
+      <tr>
+        <td width="90">就医登记号</td>
+        <td colspan="11">{{info.mdtrt_id}}</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 width="80">出生日期</td>
+        <td width="100">{{info.brdy}}</td>
+        <td width="90">个人电脑号</td>
+        <td width="110">{{info.psn_no}}</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 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>{{info.number}}</td>
+        <td>科别</td>
+        <td width="100"></td>
+        <td>床号</td>
+        <td></td>
+        <td>入院日期</td>
+        <td>{{info.begndate}}</td>
+        <td>出院日期</td>
+        <td width="100">{{info.enddate}}</td>
+        <td>住院天数</td>
+        <td>{{getDay(info.begndate,info.enddate) + 1}}</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.split(' ')[0]}}</td>
+      </tr>
+      <tr>
+        <td colspan="12" style="text-align:left;padding-left:10px;">
+          本次就医：总费用{{info.medfee_sumamt}}元，基金支付{{info.fund_pay_sumamt}}元，个人支付{{info.psn_pay}}元。
+          (起付线 {{info.act_pay_dedc}}元, 先自付 {{info.preselfpay_amt}}元, 段内自付 )
+        </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">{{info.charge_admin.user_name}}</td>
+        <td>审核人:</td>
+        <td colspan="2">{{info.p_admin.user_name}}</td>
+        <td>制单人:</td>
+        <td colspan="2">{{info.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 {}
+      }
+    }, p_admin: {
+      type: Object,
+      default: function() {
+        return {}
+      }
+    }, charge_admin: {
+      type: Object,
+      default: function() {
+        return {}
+      }
+    }
+  },methods:{
+    getDay(dateString1,dateString2){
+      var  startDate = Date.parse(dateString1);
+      var  endDate = Date.parse(dateString2);
+      if (startDate>endDate){
+        return 0;
+      }
+      if (startDate==endDate){
+        return 1;
+      }
+      var days=(endDate - startDate)/(1*24*60*60*1000);
+      return  days;
+
+    },
+    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
+    },
+
+  }
+}
+
+
+</script>
+
+
+<style lang="scss" scoped>
+.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 {
+  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: 14px;
+  border-color: #000;
+}
+</style>

src/xt_pages/hospitalStation/summary.vue

@@ -159,8 +159,9 @@
                 width="1200px"
                 title="打印"
                 :visible.sync="statementVisible">
-            <!--<statementPrint ref="print" :paramsObj='orderObj'></statementPrint>-->
-            <new-statement-print ref="print" :paramsObj='orderObj'></new-statement-print>
+            <statementPrint ref="print" :paramsObj='orderObj'></statementPrint>
+<!--            <new-statement-print ref="print" :paramsObj='orderObj'></new-statement-print>-->
+<!--          <state-->
         </el-dialog>
         <el-dialog
                 class="centerDialog"
@@ -182,6 +183,7 @@
                 width="1200px"
                 title="打印"
                 :visible.sync="statementVisible9504">
+
             <!--<statementPrint ref="print" :paramsObj='orderObj'></statementPrint>-->
             <!--<new-statement-print ref="print" :paramsObj='orderObj9504'></new-statement-print>-->
             <new-statement-print-two ref="print" :paramsObj='orderObj9504'></new-statement-print-two>
@@ -218,6 +220,8 @@
   import { fetchAllAdminUsers } from '@/api/doctor'
   import axios from 'axios'
   import invoicePrint from './invoicePrint'
+  import statementPrint from './statementPrint'
+
   // import settlementPrint from './settlementPrint'
 
   export default {
@@ -227,6 +231,7 @@
       BreadCrumb,
       listPrint,
       allListPrint,
+      statementPrint,
       invoicePrint
       // settlementPrint
     },
@@ -263,6 +268,7 @@
           { value: 2, label: '结算时间' }
         ],
         p_types:[
+          { value: 0, label: '全部' },
           { value: 1, label: '住院' },
           { value: 2, label: '门诊' }
         ],

src/xt_pages/hospitalStation/template/printOne.vue

@@ -1,354 +1,483 @@
 <template>
-  <div id='prescriptionPrint'>
-    <div v-for="(item,index) in advicePrint" :key="index">
-      <div id='prescription-print' class="prescription-print" style="page-break-after: always;">
-          <div class="printTitle" v-if="prescriptions[0].med_type == '1111'">{{orgname}}第一类精神药品处方笺</div>
-          <div class="printTitle" v-if="prescriptions[0].med_type == '1112'">{{orgname}}第二类精神药品处方笺</div>
-          <div class="printTitle" v-else>{{orgname}}处方笺</div>
+  <div id="prescriptionPrint">
+    <div v-for="(item, index) in advicePrint" :key="index">
+      <div
+        id="prescription-print"
+        class="prescription-print"
+        style="page-break-after: always"
+      >
+        <div class="printTitle" v-if="prescriptions[0].med_type == '1111'">
+          {{ orgname }}第一类精神药品处方笺
+        </div>
+        <div class="printTitle" v-if="prescriptions[0].med_type == '1112'">
+          {{ orgname }}第二类精神药品处方笺
+        </div>
+        <div class="printTitle" v-else>{{ orgname }}处方笺</div>
 
-
-          <div class="infoTitle">
-              <p>姓名：{{item.patient.name?item.patient.name:""}}</p>
-              <p>性别：
-                <span v-if="item.patient.gender == 1">男</span>
-                <span v-if="item.patient.gender == 2">女</span>
-              </p>
-              <p>年龄：{{getAge(item.patient)?getAge(item.patient):""}}岁</p>
+        <div class="infoTitle">
+          <p>姓名：{{ item.patient.name ? item.patient.name : "" }}</p>
+          <p>
+            性别：
+            <span v-if="item.patient.gender == 1">男</span>
+            <span v-if="item.patient.gender == 2">女</span>
+          </p>
+          <p>年龄：{{ getAge(item.patient) ? getAge(item.patient) : "" }}岁</p>
+        </div>
+        <div class="infoMain">
+          <div style="margin-bottom: 10px">
+            门诊号：{{ hisPatient.number ? hisPatient.number : "" }}
           </div>
-          <div class="infoMain">
-              <div style="margin-bottom: 10px;">门诊号：{{hisPatient.number?hisPatient.number:""}}</div>
-              <div style="margin-bottom: 10px;">科室：{{item.info?getDepart(item.info.departments):''}}</div>
-              <div style="margin-bottom: 10px;">医保卡号：{{""}}</div>
-              <div style="margin-bottom: 10px;">电话：{{item.patient.phone}}</div>
-              <div>地址：{{item.patient.home_address}}</div>
-              <div style="display:flex;width:50%;">临床诊断：{{getDiagnosis(item.info.diagnosis)}}</div>
+          <div style="margin-bottom: 10px">
+            科室：{{ item.info ? getDepart(item.info.departments) : "" }}
+          </div>
+          <div style="margin-bottom: 10px">医保卡号：{{ "" }}</div>
+          <div style="margin-bottom: 10px">电话：{{ item.patient.phone }}</div>
+          <div>地址：{{ item.patient.home_address }}</div>
+          <div style="display: flex; width: 50%">
+            临床诊断：{{ getDiagnosis(item.info.diagnosis) }}
+          </div>
+        </div>
+        <div class="prescriptionBox">
+          <div class="Rp">Rp:</div>
+          <div
+            class="drugsBox"
+            v-for="(it, index) in item.advices"
+            :key="index"
+          >
+            <!-- <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div> -->
+            <div class="drugsOne">
+              <span style="font-weight: bold">{{ index + 1 + "." }}</span
+              >{{ it.advice_name ? it.advice_name : "" }}&nbsp;&nbsp;<span
+                v-if="it.drug.min_unit != it.drug.dose_unit"
+                >{{ it.drug.dose }}{{ it.drug.dose_unit }}&nbsp;* &nbsp;</span
+              >{{ it.drug.min_number }}{{ it.drug.min_unit }}/{{
+                it.drug.max_unit
+              }}&nbsp;×&nbsp; {{ it.prescribing_number
+              }}{{ it.prescribing_number_unit }}
+            </div>
+            <div style="margin-left: 100px">
+              <span>用法：{{ it.single_dose }}{{ it.single_dose_unit }}</span
+              >&nbsp;&nbsp;<span
+                >{{ it.execution_frequency }}&nbsp;{{
+                  it.delivery_way
+                }}&nbsp;</span
+              >&nbsp;&nbsp;<span>{{ it.advice_desc }}</span>
+            </div>
+          </div>
+          <div
+            class="drugsBox"
+            v-for="(it, i) in item.additionalcharge"
+            :key="i"
+          >
+            <div class="drugsOne">
+              {{ it.item_name ? it.item_name : "" }}:&nbsp;{{ it.price }}元/{{
+                it.count
+              }}次
+            </div>
           </div>
-          <div class="prescriptionBox">
-              <div class="Rp">Rp:</div>
-              <div class="drugsBox" v-for="(it,index) in item.advices" :key="index">
-                  <!-- <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div> -->
-                  <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;<span v-if="it.drug.min_unit != it.drug.dose_unit">{{it.drug.dose}}{{it.drug.dose_unit}}&nbsp;* &nbsp;</span>{{it.drug.min_number}}{{it.drug.min_unit}}/{{it.drug.max_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div>
-                  <div style="margin-left:100px;"><span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.execution_frequency}}&nbsp;{{it.delivery_way}}&nbsp;</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
-              </div>
-              <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
-                <div class="drugsOne">{{it.item_name?it.item_name:""}}:&nbsp;{{it.price}}元/{{it.count}}次</div>
-               </div>
-
-              <div class="drugsBox" v-for="(it,index) in item.project" :key="index">
-                  <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.type == 2?getProjectName(it.project_id)?getProjectName(it.project_id):"":it.good_info.good_name}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.count}}{{unit}}</div>
-                  <div style="margin-left:100px;"><span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.delivery_way}}</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
-              </div>
-              <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
-                <div class="drugsOne">{{it.project_id?it.project_id:""}}:&nbsp;{{it.price}}元/{{it.count}}次</div>
-               </div>
-               <div style="text-align:center;" >(以下空白)</div>
 
+          <div
+            class="drugsBox"
+            v-for="(it, index) in item.project"
+            :key="index"
+          >
+            <div class="drugsOne">
+              <span style="font-weight: bold">{{ index + 1 + "." }}</span
+              >{{
+                it.type == 2
+                  ? getProjectName(it.project_id)
+                    ? getProjectName(it.project_id)
+                    : ""
+                  : it.good_info.good_name
+              }}&nbsp;&nbsp;{{ it.single_dose
+              }}{{ it.single_dose_unit }}&nbsp;×&nbsp; {{ it.count }}{{ unit }}
+            </div>
+            <div style="margin-left: 100px">
+              <span>用法：{{ it.single_dose }}{{ it.single_dose_unit }}</span
+              >&nbsp;&nbsp;<span>{{ it.delivery_way }}</span
+              >&nbsp;&nbsp;<span>{{ it.advice_desc }}</span>
+            </div>
           </div>
-          <div class="doctorBox">
-              <p>医师：{{item.doctor?item.doctor:""}}</p>
-              <p>日期：{{getTime(item.pre_time)?getTime(item.pre_time):""}}</p>
+          <div
+            class="drugsBox"
+            v-for="(it, i) in item.additionalcharge"
+            :key="i"
+          >
+            <div class="drugsOne">
+              {{ it.project_id ? it.project_id : "" }}:&nbsp;{{ it.price }}元/{{
+                it.count
+              }}次
+            </div>
           </div>
-          <div class="actionBar">
-                 <!-- <p>审核：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
+          <div style="text-align: center">(以下空白)</div>
+        </div>
+        <div class="doctorBox">
+          <p>
+            医师：
+            <span
+              style="width: 100px; display: inline-block"
+              v-if="setAdminUserES(item.creater) == ''"
+            >
+              {{ item.doctor }}
+            </span>
+            <img
+              style="height: 30px"
+              :src="setAdminUserES(item.creater)"
+              alt=""
+              srcset=""
+              v-else
+            />
+          </p>
+          <p>
+            日期：{{ getTime(item.pre_time) ? getTime(item.pre_time) : "" }}
+          </p>
+        </div>
+        <div class="actionBar">
+          <!-- <p>审核：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
                  <p>配对：</p>
                  <p>核对：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
                  <p>发药：{{getDoctor(item.advices[0].execution_staff)?getDoctor(item.advices[0].execution_staff):""}}</p>
                  <p>药费：{{getTotalOne(item.id)?getTotalOne(item.id):0}}元</p> -->
 
-                 <p>审核：</p>
-                 <p>配对：</p>
-                 <p>核对：</p>
-                 <p>发药：</p>
-                 <p>药费：{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):0}}元</p>
-<!--            <p>药费：551.20元</p>-->
-
-          </div>
-          <div style="page-break-after:always"></div>
+          <p>审核：</p>
+          <p>配对：</p>
+          <p>核对：</p>
+          <p>发药：</p>
+          <p>
+            药费：{{
+              getTotalOne(item.id).toFixed(2)
+                ? getTotalOne(item.id).toFixed(2)
+                : 0
+            }}元
+          </p>
+          <!--            <p>药费：551.20元</p>-->
+        </div>
+        <div style="page-break-after: always"></div>
       </div>
     </div>
-
   </div>
-
-
 </template>
 <script>
-import { jsGetAge, uParseTime } from '@/utils/tools'
-import {getAllDoctorList,getPrescriptionPrint,getHisPatientDetail} from "@/api/project/project"
-import {getInitData} from "@/api/his/his"
+import { jsGetAge, uParseTime } from "@/utils/tools";
+import {
+  getAllDoctorList,
+  getPrescriptionPrint,
+  getHisPatientDetail,
+} from "@/api/project/project";
+import { getInitData } from "@/api/his/his";
 export default {
-    props:{
-      patient_id:Number,
-      record_date:String,
-      prescription_id:Number,
-      ids:String
+  props: {
+    patient_id: Number,
+    record_date: String,
+    prescription_id: Number,
+    ids: String,
+  },
+  data() {
+    return {
+      doctorList: [],
+      advicePrint: {},
+      patient: {},
+      tableData: [],
+      prescriptionInfo: [],
+      hisPatient: {},
+      department: [],
+      prescriptions: [],
+      projectList: [],
+      orgname: "",
+      diagnoses: [],
+      operatorMaps: {},
+    };
+  },
+  methods: {
+    // 电子签名
+    setAdminUserES(id) {
+      if (id == 0) {
+        return "";
+      }
+      if (id in this.operatorMaps) {
+        return this.operatorMaps[id].url;
+      } else {
+        return "";
+      }
     },
-    data(){
-      return {
-        doctorList:[],
-        advicePrint:{},
-        patient:{},
-        tableData:[],
-        prescriptionInfo:[],
-        hisPatient:{},
-        department:[],
-        prescriptions:[],
-        projectList:[],
-        orgname:"",
-        diagnoses:[],
+    getAge(patient) {
+      var thisLen = patient.id_card_no.length;
+      var birth = "";
+      if (thisLen == 15) {
+        birth = "19" + patient.id_card_no.substr(6, 6);
+      } else {
+        birth = patient.id_card_no.substr(6, 8);
       }
+      var births =
+        birth.substr(0, 4) +
+        "-" +
+        birth.substr(4, 2) +
+        "-" +
+        birth.substr(6, 2);
+      return jsGetAge(births, "-");
     },
-   methods:{
-     getAge(patient){
-       var thisLen = patient.id_card_no.length
-       var birth = ''
-       if (thisLen == 15) {
-         birth = '19' + patient.id_card_no.substr(6, 6)
-       } else {
-         birth = patient.id_card_no.substr(6, 8)
-       }
-       var births =
-         birth.substr(0, 4) +
-         '-' +
-         birth.substr(4, 2) +
-         '-' +
-         birth.substr(6, 2)
-       return jsGetAge(births, '-')
 
-     },
+    getAllDoctorList() {
+      getAllDoctorList().then((response) => {
+        if (response.data.state == 1) {
+          var doctor = response.data.data.doctor;
 
-     getAllDoctorList(){
-      getAllDoctorList().then(response=>{
-        if(response.data.state == 1){
-               var doctor =  response.data.data.doctor
-
-               this.doctorList = doctor
-             }
-         })
-     },
+          this.doctorList = doctor;
+        }
+      });
+    },
 
-      getDoctor(id){
-        var name = ""
-        for(let i=0;i<this.doctorList.length;i++){
-          if(id == this.doctorList[i].admin_user_id){
-              name = this.doctorList[i].user_name
+    getDoctor(id) {
+      var name = "";
+      for (let i = 0; i < this.doctorList.length; i++) {
+        if (id == this.doctorList[i].admin_user_id) {
+          name = this.doctorList[i].user_name;
+        }
+      }
+      return name;
+    },
+    getTime(value, temp) {
+      if (value != undefined) {
+        return uParseTime(value, temp);
+      }
+      return "";
+    },
+    getPrescriptionPrint() {
+      var params = {
+        // patient_id:this.patient_id,
+        // record_date:this.record_date,
+        // prescription_id:this.prescription_id,
+        patient_id: this.patient_id,
+        record_date: this.record_date,
+        prescription_id: this.prescription_id,
+        ids: this.ids,
+        p_type: 1,
+      };
+      console.log("params", params);
+      getPrescriptionPrint(params).then((response) => {
+        if (response.data.state == 1) {
+          var advicePrint = response.data.data.advicePrint;
+          console.log("adviceprint9999", advicePrint);
+          this.advicePrint = advicePrint;
+          this.prescriptions = advicePrint;
+          if (this.advicePrint.length > 0) {
+            var operatorsLen = this.advicePrint.length;
+            for (var index = 0; index < operatorsLen; index++) {
+              this.$set(
+                this.operatorMaps,
+                this.operators[index].creator,
+                this.operators[index]
+              );
+            }
           }
+          console.log("处方222222", this.prescriptions);
+          var hisPatient = response.data.data.hisHospitalRecord;
+          this.hisPatient = hisPatient;
+          var projectlist = response.data.data.projectlist;
+          console.log("所有项目列表", projectlist);
+          this.projectList = projectlist;
         }
-        return name
-      },
-      getTime(value, temp) {
-        if (value != undefined) {
-            return uParseTime(value, temp)
+      });
+    },
+    getHisPatientDetail() {
+      const params = {
+        patient_id: this.patient_id,
+      };
+      getHisPatientDetail(params).then((response) => {
+        if (response.data.state == 1) {
+          var hisPatient = response.data.data.hisHospitalRecord;
+          console.log("挂号病人", hisPatient);
+          this.hisPatient = hisPatient;
         }
-        return ''
-     },
-       getPrescriptionPrint(){
-         var params = {
-          // patient_id:this.patient_id,
-          // record_date:this.record_date,
-          // prescription_id:this.prescription_id,
-          patient_id:this.patient_id,
-          record_date:this.record_date,
-          prescription_id:this.prescription_id,
-          ids:this.ids,
-          p_type:1,
+      });
+    },
+    getInitData() {
+      getInitData().then((response) => {
+        if (response.data.state == 1) {
+          this.department = response.data.data.department;
+          this.diagnoses = response.data.data.diagnose;
+          console.log("争端", this.diagnoses);
         }
-        console.log("params",params)
-       getPrescriptionPrint(params).then(response=>{
-         if(response.data.state == 1){
-            var advicePrint =  response.data.data.advicePrint
-            console.log("adviceprint9999",advicePrint)
-            this.advicePrint = advicePrint
-            this.prescriptions = advicePrint
-            console.log("处方222222",this.prescriptions)
-            var hisPatient = response.data.data.hisHospitalRecord
-            this.hisPatient = hisPatient
-            var projectlist =  response.data.data.projectlist
-            console.log("所有项目列表",projectlist)
-            this.projectList = projectlist
-          }
-       })
-     },
-     getHisPatientDetail(){
-          const params = {
-              patient_id:this.patient_id,
-          }
-       getHisPatientDetail(params).then(response=>{
-          if(response.data.state == 1){
-             var hisPatient =  response.data.data.hisHospitalRecord
-             console.log("挂号病人",hisPatient)
-             this.hisPatient = hisPatient
-          }
-       })
-     },
-     getInitData(){
-       getInitData().then(response=>{
-          if(response.data.state == 1){
-            this.department = response.data.data.department
-            this.diagnoses = response.data.data.diagnose
-            console.log("争端",this.diagnoses)
-          }
-       })
-     },
-     getDepart(id){
-         var name = ""
-       for(let i=0;i<this.department.length;i++){
-           if(id == this.department[i].id){
-               name = this.department[i].name
-           }
-       }
-       return name
-     },
+      });
+    },
+    getDepart(id) {
+      var name = "";
+      for (let i = 0; i < this.department.length; i++) {
+        if (id == this.department[i].id) {
+          name = this.department[i].name;
+        }
+      }
+      return name;
+    },
     getTotalOne(id) {
-
-        var total = 0
-        var addtotal = 0
-        for (let i = 0; i < this.prescriptions.length; i++) {
-          if(id == this.prescriptions[i].id){
-            if (this.prescriptions[i].project != null) {
-              for (let a = 0; a < this.prescriptions[i].project.length; a++) {
-                total = total + this.prescriptions[i].project[a].price * this.prescriptions[i].project[a].count
-              }
+      var total = 0;
+      var addtotal = 0;
+      for (let i = 0; i < this.prescriptions.length; i++) {
+        if (id == this.prescriptions[i].id) {
+          if (this.prescriptions[i].project != null) {
+            for (let a = 0; a < this.prescriptions[i].project.length; a++) {
+              total =
+                total +
+                this.prescriptions[i].project[a].price *
+                  this.prescriptions[i].project[a].count;
             }
+          }
 
-            if (this.prescriptions[i].additionalcharge != null) {
-              for (let a = 0; a < this.prescriptions[i].additionalcharge.length; a++) {
-                addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
-              }
+          if (this.prescriptions[i].additionalcharge != null) {
+            for (
+              let a = 0;
+              a < this.prescriptions[i].additionalcharge.length;
+              a++
+            ) {
+              addtotal =
+                addtotal +
+                this.prescriptions[i].additionalcharge[a].price *
+                  this.prescriptions[i].additionalcharge[a].count;
             }
-              addtotal =  Math.floor(addtotal * 100) / 100
+          }
+          addtotal = Math.floor(addtotal * 100) / 100;
         }
-
-       }
+      }
 
       for (let i = 0; i < this.prescriptions.length; i++) {
-          if(id == this.prescriptions[i].id){
-            if (this.prescriptions[i].advices != null) {
-              for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
-                total = total + this.prescriptions[i].advices[a].price * this.prescriptions[i].advices[a].prescribing_number
-              }
+        if (id == this.prescriptions[i].id) {
+          if (this.prescriptions[i].advices != null) {
+            for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
+              total =
+                total +
+                this.prescriptions[i].advices[a].price *
+                  this.prescriptions[i].advices[a].prescribing_number;
             }
+          }
 
-            if (this.prescriptions[i].additionalcharge != null) {
-              for (let a = 0; a < this.prescriptions[i].additionalcharge.length; a++) {
-                addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
-              }
+          if (this.prescriptions[i].additionalcharge != null) {
+            for (
+              let a = 0;
+              a < this.prescriptions[i].additionalcharge.length;
+              a++
+            ) {
+              addtotal =
+                addtotal +
+                this.prescriptions[i].additionalcharge[a].price *
+                  this.prescriptions[i].additionalcharge[a].count;
             }
-              addtotal =  Math.floor(addtotal * 100) / 100
+          }
+          addtotal = Math.floor(addtotal * 100) / 100;
         }
-       }
+      }
 
-        return total + addtotal
-      },
+      return total + addtotal;
+    },
 
-     getProjectName(id){
-        var project_name = ""
-        for(let i=0;i<this.projectList.length;i++){
-           if(id == this.projectList[i].id){
-               project_name = this.projectList[i].project_name
-           }
+    getProjectName(id) {
+      var project_name = "";
+      for (let i = 0; i < this.projectList.length; i++) {
+        if (id == this.projectList[i].id) {
+          project_name = this.projectList[i].project_name;
         }
-        return project_name
-     },
-
-     getDiagnosis(id) {
-       let arr = id.split(',')
-       var name = ''
-       for (let i = 0; i < this.diagnoses.length; i++) {
-         if (arr.indexOf(String(this.diagnoses[i].id)) > -1) {
-           name += this.diagnoses[i].class_name + ' '
-         }
-       }
-       return name
-     },
-
-   },
-   created(){
-      this.getAllDoctorList()
-      this.getInitData()
-      this.getPrescriptionPrint()
-      this.getHisPatientDetail()
-      var xtuser = this.$store.getters.xt_user;
-      this.orgname = xtuser.org.org_name;
+      }
+      return project_name;
+    },
 
-   },
-   watch:{
-     ids:function(val){
-      this.ids = val
-      this.getPrescriptionPrint()
-    }
-   }
-}
+    getDiagnosis(id) {
+      let arr = id.split(",");
+      var name = "";
+      for (let i = 0; i < this.diagnoses.length; i++) {
+        if (arr.indexOf(String(this.diagnoses[i].id)) > -1) {
+          name += this.diagnoses[i].class_name + " ";
+        }
+      }
+      return name;
+    },
+  },
+  created() {
+    this.getAllDoctorList();
+    this.getInitData();
+    this.getPrescriptionPrint();
+    this.getHisPatientDetail();
+    var xtuser = this.$store.getters.xt_user;
+    this.orgname = xtuser.org.org_name;
+  },
+  watch: {
+    ids: function (val) {
+      this.ids = val;
+      this.getPrescriptionPrint();
+    },
+  },
+};
 </script>
 
 
 <style lang="scss" scoped>
-.prescription-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;
+.prescription-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;
 }
-.printTitle{
-    font-size: 22px;
-    text-align: center;
-    font-weight: bold;
+.printTitle {
+  font-size: 22px;
+  text-align: center;
+  font-weight: bold;
 }
-.infoTitle{
-    display: flex;
-    border-bottom: 2px solid #000;
-    margin-top:10px;
-    line-height: 24px;
-    padding:0 10px;
+.infoTitle {
+  display: flex;
+  border-bottom: 2px solid #000;
+  margin-top: 10px;
+  line-height: 24px;
+  padding: 0 10px;
 }
-.infoTitle p{
-    width: 200px;
+.infoTitle p {
+  width: 200px;
 }
-.infoMain{
-    display: flex;
-    flex-wrap: wrap;
-    border-bottom: 2px solid #000;
-    padding:0 10px;
+.infoMain {
+  display: flex;
+  flex-wrap: wrap;
+  border-bottom: 2px solid #000;
+  padding: 0 10px;
 }
-.infoMain div{
-    width: 50%;
-    line-height: 24px;
+.infoMain div {
+  width: 50%;
+  line-height: 24px;
 }
-.prescriptionBox{
-    padding:0 10px;
-    min-height:450px;
+.prescriptionBox {
+  padding: 0 10px;
+  min-height: 450px;
 }
-.Rp{
-    font-size: 22px;
-    font-weight: bold;
+.Rp {
+  font-size: 22px;
+  font-weight: bold;
 }
-.drugsBox{
-    padding-left: 40px;
-    margin-bottom: 10px;
+.drugsBox {
+  padding-left: 40px;
+  margin-bottom: 10px;
 }
-.drugsBox div{
-    line-height: 20px;
+.drugsBox div {
+  line-height: 20px;
 }
-.drugsOne{
-    line-height: 24px;
+.drugsOne {
+  line-height: 24px;
 }
-.drugsOne span{
-    margin-right: 20px;
+.drugsOne span {
+  margin-right: 20px;
 }
-.doctorBox{
-    display: flex;
-    justify-content: space-between;
-    padding:0 10px;
-    line-height: 24px;
-    border-bottom: 2px solid #000;
+.doctorBox {
+  display: flex;
+  justify-content: space-between;
+  padding: 0 10px;
+  line-height: 24px;
+  border-bottom: 2px solid #000;
 }
-.actionBar{
-    display: flex;
-    justify-content: space-between;
-    line-height: 24px;
-    padding:0 10px;
+.actionBar {
+  display: flex;
+  justify-content: space-between;
+  line-height: 24px;
+  padding: 0 10px;
 }
-.actionBar p{
-    width:150px;
+.actionBar p {
+  width: 150px;
 }
 </style>

src/xt_pages/hospitalStation/template/printTwo.vue

@@ -15,7 +15,7 @@
             <div style="margin-bottom: 10px;">医保卡号：{{this.hisPatient.number?this.hisPatient.number:""}}</div>
             <div style="margin-bottom: 10px;">电话：{{patient.phone}}</div>
             <div>地址：{{patient.home_address}}</div>
-            <div style="display:flex;width:50%;">临床诊断：22222{{ getDiagnosis(advicePrint[0].info.diagnosis) }}</div>
+            <div style="display:flex;width:50%;">临床诊断：{{ getDiagnosis(advicePrint[0].info.diagnosis) }}</div>
         </div>
         <div class="prescriptionBox">
             <div class="Rp">Rp:</div>

src/xt_pages/outpatientCharges/components/prescriptionTable.vue

@@ -6,7 +6,6 @@
       border
       style="width: 99%"
       :row-style="changColor"
-      :row-class-name="tableRowClassName"
       :header-cell-style="{
         color: '#606266',
       }"
@@ -19,7 +18,13 @@
         width="40"
         label="序号"
       ></el-table-column>
-      <el-table-column fixed align="center" prop="name" width="400" label="名称">
+      <el-table-column
+        fixed
+        align="center"
+        prop="name"
+        width="400"
+        label="名称"
+      >
         <template slot-scope="scope"
           ><span :title="scope.row.drug_name">{{
             scope.row.drug_name
@@ -27,14 +32,10 @@
         >
       </el-table-column>
 
-      <el-table-column align="center" prop="name" width="70" label="单次用量">
+      <el-table-column align="center" prop="name" width="80" label="单次用量">
         <template slot-scope="scope">
-          <!--<el-input v-model="scope.row.single_dose" readonly style="width:65%;"></el-input>-->
-          <div>
-            {{ scope.row.single_dose }}&nbsp;&nbsp;{{
-              scope.row.single_dose_unit
-            }}
-          </div>
+          <!--<el-input v-model="scope.row.delivery_way" readonly></el-input>-->
+          <div>{{ scope.row.single_dose }}{{ scope.row.single_dose_unit }}</div>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" width="80" label="用法">
@@ -54,16 +55,8 @@
       <el-table-column align="center" prop="day" width="80" label="天数">
         <template slot-scope="scope">{{ scope.row.day }}天</template>
       </el-table-column>
-
       <el-table-column align="center" prop="name" width="80" label="总量">
-        <template slot-scope="scope">
-          <!--<el-input v-model="scope.row.prescribing_number" style="width:60%" readonly placeholder=""></el-input>-->
-          <div>
-            {{ scope.row.prescribing_number }}&nbsp;&nbsp;{{
-              scope.row.prescribing_number_unit
-            }}
-          </div>
-        </template>
+        <template slot-scope="scope">{{ scope.row.prescribing_number }}{{scope.row.prescribing_number_unit}}</template>
       </el-table-column>
       <el-table-column align="center" prop="name" width="80" label="单价">
         <template slot-scope="scope">
@@ -163,7 +156,13 @@
         width="40"
         label="序号"
       ></el-table-column>
-      <el-table-column fixed align="center" prop="project_name" width="400" label="名称">
+      <el-table-column
+        fixed
+        align="center"
+        prop="project_name"
+        width="400"
+        label="名称"
+      >
         <template slot-scope="scope">{{ scope.row.project_name }}</template>
       </el-table-column>
       <el-table-column
@@ -347,17 +346,18 @@ export default {
   },
   methods: {
     changColor({ row, rowIndex }) {
-     if (rowIndex % 2 == 1) { // 变颜色的条件
-		return {
-		backgroundColor: "#C4E1FF",
-    color: '#303133'  // 这个return的就是样式 可以是color 也可以是backgroundColor
-		}
-	}else{
-    return {
-      backgroundColor:"#ACD6FF",
-      color: '#303133'
-    }
-  }
+      if (rowIndex % 2 == 1) {
+        // 变颜色的条件
+        return {
+          backgroundColor: "#C4E1FF",
+          color: "#303133", // 这个return的就是样式 可以是color 也可以是backgroundColor
+        };
+      } else {
+        return {
+          backgroundColor: "#ACD6FF",
+          color: "#303133",
+        };
+      }
     },
 
     getName(id) {

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -702,7 +702,7 @@
         this.form.id_card_type = 2
         this.form.certificates = 1
 
-        if (this.$store.getters.xt_user.org_id == 10188){
+        if (this.$store.getters.xt_user.org_id == 10188  || this.$store.getters.xt_user.org_id == 10217){
           this.form.id_card_type = 1
         }
 

src/xt_pages/outpatientCharges/invoicePrint.vue

@@ -13,13 +13,15 @@
     </template>
     <div class="app-container" style="padding-top:40px;">
         <div class='dialysisPage'>
-          <div v-if="org_id != 10106 && org_id != 10215 && org_id != 4 && org_id != 10188 && org_id != 0" >
-            <printOne v-if="org_id != 10088" :paramsObj="invoiceParams"></printOne>
+          <div v-if="org_id != 10106 && org_id != 10215 && org_id != 4 && org_id != 10188 && org_id != 10217  && org_id != 0" >
+            <printOne v-if="org_id != 10088 " :paramsObj="invoiceParams"></printOne>
             <printThree v-if="org_id == 10088" :paramsObj="invoiceParams"></printThree>
           </div>
           <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
           <printFour v-if="org_id == 10215 || org_id == 4" :paramsObj="invoiceParams"></printFour>
-          <printFive v-if="org_id == 10188 || org_id == 0" :paramsObj="invoiceParams"></printFive>
+          <printFive v-if="org_id == 10188 " :paramsObj="invoiceParams"></printFive>
+
+          <printSix v-if="org_id == 10217|| org_id == 0" :paramsObj="invoiceParams"></printSix>
         </div>
     </div>
   </div>
@@ -31,6 +33,7 @@ import printTwo from './invoiceTemplate/printTwo'
 import printThree from './invoiceTemplate/printThree'
 import printFour from './invoiceTemplate/printFour'
 import printFive from './invoiceTemplate/printFive'
+import printSix from './invoiceTemplate/printSix'
 export default {
    name: "invoicePrint",
   components: {
@@ -38,7 +41,8 @@ export default {
     printTwo,
     printThree,
     printFour,
-    printFive
+    printFive,
+    printSix
   },
   props:{
     invoiceParams:Object

src/xt_pages/outpatientCharges/invoiceTemplate/printFour.vue

@@ -6,14 +6,14 @@
         </div>
         <div style="display:flex;justify-content: space-between;">
             <!-- <div>{{ list.department_name }}</div> -->
-            <div  style="position: absolute;top:50px;left:260px">{{ list.id_card_no }}</div>
+            <div  style="position: absolute;top:50px;left:260px">{{ list.order.certno?list.order.certno:list.his.id_card_no?list.his.id_card_no:list.his_hospital_record.id_card_no}}</div>
             <div></div>
         </div>
         <div style="display:flex;justify-content: space-between;">
             <!-- <div>{{ list.department_name }}</div> -->
             <div  style="position: absolute;top:70px;left:90px">门诊</div>
             <div></div>
-            <div  style="position: absolute;top:70px;left:240px">{{ list.number }}</div>
+            <div  style="position: absolute;top:70px;left:240px">{{ list.order.mdtrt_id }}</div>
             <div  style="position: absolute;left:470px;top:70px;">
                 <span>{{  paramsObj.setl_time ? paramsObj.setl_time.split(' ')[0].slice(0,4) : getTime(list.date, '{y}-{m}-{d}').slice(0,4) }}</span>
             </div>
@@ -181,6 +181,10 @@ export default {
                 this.list = res.data.data
                 this.totalPrice = this.list.westernMedicineCostTotal + this.list.checkCostTotal + this.list.treatCostTotal + this.list.bedCostTotal + this.list.chineseTraditionalMedicineCostTotal +
                                     this.list.laboratoryCostTotal + this.list.operationCostTotal + this.list.otherCostTotal + this.list.materialCostTotal
+                if(this.totalPrice == 0){
+
+                  this.totalPrice = this.list.medfee_sumamt
+                }
                 this.smalltoBIG(this.totalPrice)
                 var data = new Date(res.data.data.date * 1000);
                 var month =data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;

src/xt_pages/outpatientCharges/invoiceTemplate/printSix.vue

@@ -0,0 +1,231 @@
+<template>
+    <div id='invoice-print'>
+        <div v-for='(i,index) in pageArr.length' :key="index">
+            <div :style="{position: 'absolute',top:(10 + (index * 400))  + 'px',left:130+ 'px',}">盐城大丰悦达金骆驼血液透析中心</div>
+            <div :style="{position: 'absolute',top:(40 + (index * 400))  + 'px',left:90+ 'px',}">{{ list.order_number }}</div>
+            <div style="display:flex;justify-content: space-between;">
+                <div :style="{position: 'absolute',top:(70 + (index * 400))  + 'px',left:80+ 'px',}">{{ paramsObj.name }}</div>
+            </div>
+            <div :style="{position: 'absolute',top:(130 + (index * 400))  + 'px',left:80+ 'px',}">
+                <div v-if="list.westernMedicineCostTotal">西药 {{ list.westernMedicineCostTotal }}</div>
+                <div v-if="list.treatCostTotal">治疗费 {{ list.treatCostTotal }}</div>
+                <div v-if="list.bedCostTotal">床位费 {{ list.bedCostTotal }}</div>
+                <div v-if="list.chineseTraditionalMedicineCostTotal">中成药 {{ list.chineseTraditionalMedicineCostTotal }}</div>
+                <div v-if="list.laboratoryCostTotal">化验费 {{ list.laboratoryCostTotal }}</div>
+                <div v-if="list.operationCostTotal">手术费 {{ list.operationCostTotal }}</div>
+                <div v-if="list.otherCostTotal">其他费 {{ list.otherCostTotal }}</div>
+                <div v-if="list.materialCostTotal">材料费 {{ list.materialCostTotal }}</div>
+            </div>
+            <div :style="{position: 'absolute',top:(130 + (index * 400))  + 'px',left:260+ 'px'}">
+                <div v-for="item in list.order_info.slice(index * 10,(index * 10) + pageArr[index])">
+                    <span style="display:inline-block;width:200px;">
+                        <span v-if="item.advice.id == 0">
+                            <span v-if="item.project.type == 2"> {{ item.project.project.project_name }}</span>
+                            <span v-if="item.project.type == 3">{{ item.project.good_info.good_name }}</span>
+                        </span>
+                        <span v-else>{{ item.advice.advice_name }}</span>
+                    </span>
+                    <span style="display:inline-block;width:50px;">
+                        <span v-if="item.advice.id == 0">
+                            <span v-if="item.project.type == 2">{{ item.project.count }}{{ item.project.unit }}</span>
+                            <span v-if="item.project.type == 3">{{ item.project.count }}{{ item.project.unit }}</span>
+                        </span>
+                        <span v-else>{{ item.advice.prescribing_number }}{{ item.advice.prescribing_number_unit }}</span>
+                    </span>
+                    <span>
+                        <span v-if="item.advice.id == 0">
+                            <span v-if="item.project.type == 2">{{ (item.project.count * item.pric).toFixed(2) }}</span>
+                            <span v-if="item.project.type == 3">{{ (item.project.count * item.pric).toFixed(2) }}</span>
+                        </span>
+                        <span v-else>{{ (item.advice.prescribing_number * item.pric).toFixed(2) }}</span>
+                    </span>
+                </div>
+            </div>
+            <div :style="{position: 'absolute',top:(345 + (index * 400))  + 'px',left:110+ 'px'}">{{ zhongwen }}</div>
+            <div :style="{position: 'absolute',top:(345 + (index * 400))  + 'px',left:460+ 'px'}">{{ list.medfee_sumamt }}</div>
+            <div v-if="index == pageArr.length - 1" :style="{position: 'absolute',top:(360 + (index * 400))  + 'px',left:110+ 'px',width:100 + '%',fontSize:12+'px'}">
+                <div style="display:flex;">
+                  <div style="width:140px">医疗总费用：{{ list.order.medfee_sumamt }}</div>
+                  <div style="width:140px">基金支付总额：{{ list.order.fund_pay_sumamt }}</div>
+                  <div style="width:140px">统筹支出：{{ list.order.hifp_pay }}</div>
+                  <div style="width:140px">大病支出：{{list.order.hifmi_pay}}</div>
+
+                </div>
+                <div style="display:flex;">
+                  <div style="width:140px">个人账户支付：{{ list.order.acct_pay }}</div>
+                  <div style="width:140px">现金支出：{{ list.order.psn_cash_pay }}</div>
+                  <div style="width:140px">本次账户：0</div>
+                  <div style="width:140px">上次账户：0</div>
+                </div>
+              <div style="display:flex;">
+                <div style="width:140px">账户余额：{{ list.order.balc }}</div>
+                <div style="width:140px">其他支出：{{ list.order.oth_pay }}</div>
+                <div style="width:140px">大病补充保险支出：0</div>
+                <div style="width:140px">民政支出：0</div>
+              </div>
+              <div style="display:flex;">
+                <div style="width:220px">医疗救助基金支出：{{ list.order.maf_pay }}</div>
+                <div style="width:280px">企业补充医疗保险基金支出：{{ list.order.hifes_pay }}</div>
+              </div>
+
+            </div>
+            <div>
+                <div :style="{position: 'absolute',top:(420 + (index * 400))  + 'px',left:100+ 'px'}">盐城大丰悦达金骆驼血液透析中心</div>
+                <div :style="{position: 'absolute',top:(420 + (index * 400))  + 'px',left:360+ 'px'}">{{ paramsObj.chargeName }}</div>
+                <div :style="{position: 'absolute',top:(420 + (index * 400))  + 'px',left:520+ 'px'}">
+                    <span>{{  paramsObj.setl_time ? paramsObj.setl_time.split(' ')[0].slice(0,4) : getTime(list.date, '{y}-{m}-{d}').slice(0,4) }}</span>
+                </div>
+                <div :style="{position: 'absolute',top:(420 + (index * 400))  + 'px',left:560+ 'px'}">
+                    <span>{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(5,7)) : getTime(list.date, '{y}-{m}-{d}').slice(5,7) }}</span>
+                </div>
+                <div :style="{position: 'absolute',top:(420 + (index * 400))  + 'px',left:600+ 'px'}">
+                    <span>{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(8,11)) : getTime(list.date, '{y}-{m}-{d}').slice(8,11) }}</span>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+
+<script>
+import { getInvoice } from '@/api/project/project'
+import { uParseTime } from '@/utils/tools'
+export default {
+    props:{
+        paramsObj:Object
+    },
+    data(){
+        return{
+            list:{},
+            printDate:'',
+            zhongwen:'',
+            totalPrice:0.0,
+            org_id:'',
+            org_name:'',
+            page:1,
+            pageArr:[],
+        }
+    },
+    created(){
+        console.log('paramsObj',this.paramsObj)
+        let params = {
+            order_id: this.paramsObj.order_id,
+            patient_id: this.paramsObj.patient_id,
+        }
+        this.getInvoice(params)
+        // var data = new Date();
+        // var month =data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;
+        // var date = data.getDate() <= 9 ? "0" + data.getDate() : data.getDate();
+        // this.printDate = data.getFullYear() + "-" + month + "-" + date;
+        // this.smalltoBIG(982732.21)
+        this.org_id = this.$store.getters.xt_user.org_id
+        this.org_name = this.$store.getters.xt_user.org.org_name
+    },
+    methods:{
+        getInvoice(params){
+            getInvoice(params).then((res) => {
+                console.log('res',res)
+                this.list = res.data.data
+                console.log(this.list,'表单内容打印记得注释')
+                this.totalPrice = this.list.westernMedicineCostTotal + this.list.checkCostTotal + this.list.treatCostTotal + this.list.bedCostTotal + this.list.chineseTraditionalMedicineCostTotal +
+                                    this.list.laboratoryCostTotal + this.list.operationCostTotal + this.list.otherCostTotal + this.list.materialCostTotal
+                this.smalltoBIG(this.list.medfee_sumamt)
+                var data = new Date(res.data.data.date * 1000);
+                var month =data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;
+                var date = data.getDate() <= 9 ? "0" + data.getDate() : data.getDate();
+                this.printDate = data.getFullYear() + "-" + month + "-" + date;
+                this.pageArr = []
+                this.getPage()
+                console.log('pageArr',this.pageArr)
+            })
+        },
+        smalltoBIG(n) {
+            // let fraction = ['角', '分'];
+            // let digit = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖'];
+            // let unit = [['元.', '万,', '亿,'], ["元",'拾', '佰', '仟']];
+            // let head = price < 0 ? '欠' : '';
+            // price = Math.abs(price);
+            // let upper = '';
+            // for (let i = 0; i < fraction.length; i++) {
+            // upper += (digit[Math.floor(price * 10 * Math.pow(10, i)) % 10] + fraction[i]).replace(/零./, '');
+            // }
+            // upper = upper || '整';
+            // price = Math.floor(price);
+            // for (let i = 0; i < unit[0].length && price > 0; i++) {
+            // let p = '';
+            // for (let j = 0; j < unit[1].length && price > 0; j++) {
+            //     p = digit[price % 10] + unit[1][j] + p;
+            //     price = Math.floor(price / 10);
+            // }
+            // upper = p.replace(/(零.)*零$/, '').replace(/^$/, '零') + unit[0][i] + upper;
+            // }
+            // this.zhongwen = head + upper.replace(/(零.)*零圆/, '圆').replace(/(零.)+/g, '零').replace(/^整$/, '零圆整')
+            // console.log('6666',head + upper.replace(/(零.)*零圆/, '圆').replace(/(零.)+/g, '零').replace(/^整$/, '零圆整'))
+            if (!/^(0|[1-9]\d*)(\.\d+)?$/.test(n)){
+                return "数据非法";  //判断数据是否大于0
+            }
+
+            var unit = "仟佰拾亿仟佰拾万仟佰拾元角分", str = "";
+            n += "00";
+
+            var indexpoint = n.indexOf('.');  // 如果是小数，截取小数点前面的位数
+
+            if (indexpoint >= 0){
+
+                n = n.substring(0, indexpoint) + n.substr(indexpoint+1, 2);   // 若为小数，截取需要使用的unit单位
+            }
+
+            unit = unit.substr(unit.length - n.length);  // 若为整数，截取需要使用的unit单位
+            for (var i=0; i < n.length; i++){
+                str += "零壹贰叁肆伍陆柒捌玖".charAt(n.charAt(i)) + unit.charAt(i);  //遍历转化为大写的数字
+            }
+            console.log("str",str)
+            if(str == '零元零角零分'){
+                this.zhongwen = '零'
+            }else{
+                this.zhongwen =  str.replace(/零(仟|佰|拾|角)/g, "零").replace(/(零)+/g, "零").replace(/零(万|亿|元)/g, "$1").replace(/(亿)万|壹(拾)/g, "$1$2").replace(/^元零?|零分/g, "").replace(/元$/g, "元整");
+            }
+
+            console.log(this.zhongwen)
+        },
+        getTime(value, temp) {
+            if (value == 0) {
+                return ''
+            }
+            if (value != undefined) {
+                return uParseTime(value, temp)
+            }
+            return ''
+        },
+        getPage(){
+        if(this.list.order_info.length <= 10){
+            this.page = 1
+            this.pageArr.push(this.list.order_info.length)
+        }else if(this.list.order_info.length > 10){
+            this.page = parseInt(this.list.order_info.length / 10)
+            let num = this.list.order_info.length % 10
+            for (var i=0;i<this.page;i++){
+                this.pageArr.push(10)
+            }
+            if(num != 0){
+                this.pageArr.push(num)
+            }
+        }
+      }
+
+    },
+    watch:{
+        paramsObj:{//深度监听，可监听到对象、数组的变化
+            handler(val, oldVal){
+                let params = {
+                    order_id: val.order_id,
+                    patient_id: val.patient_id,
+                }
+                this.getInvoice(params)
+
+            },
+            deep:true
+        }
+    }
+}
+</script>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -46,7 +46,7 @@
           </el-button>
         </div>
         <div>
-          <el-table :data="patientTableData" :height="tableHeight" border style="width: 100%;"
+          <el-table  :data="patientTableData" :height="tableHeight" border style="width: 100%;"
                     :row-style="{ color: '#303133' }"
 
                     :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
@@ -60,6 +60,22 @@
               </template>
             </el-table-column>
           </el-table>
+
+<!--          <el-table v-else :data="monthChargePatientTableData" :height="tableHeight" border style="width: 100%;"-->
+<!--                    :row-style="{ color: '#303133' }"-->
+
+<!--                    :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"-->
+<!--                    highlight-current-row ref="tab"-->
+<!--                    @current-change="handleCurrentChange">-->
+<!--            <el-table-column align="center" prop="name" label="姓名" wdith='89'>-->
+<!--              <template slot-scope="scope">{{ scope.row.name }}</template>-->
+<!--            </el-table-column>-->
+<!--            <el-table-column align="center" prop="name" label="就诊号" width="110">-->
+<!--              <template slot-scope="scope">{{ scope.row.number ? scope.row.number : '' }}-->
+<!--              </template>-->
+<!--            </el-table-column>-->
+<!--          </el-table>-->
+
         </div>
       </div>
 
@@ -305,7 +321,6 @@
                         :editable="false"
                         style="width: 150px;"
                         type="date"
-                        :picker-options="pickerOptions"
                         placeholder="选择开始时间"
                         align="right"
                         format="yyyy-MM-dd"
@@ -328,9 +343,6 @@
                   <div>
                     <div class="tabsBox" v-for="(items, index) in big_month_prescriptions">
                       <div style="height: calc(100% - 60px);">
-
-
-                        <!-- <el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button> -->
                         <el-tabs class="preTabs" v-model="editableTabsValue" type="border-card"
                                  @tab-click="tabclickEventTwo">
 
@@ -344,7 +356,7 @@
                           <el-button
                               v-if="radio == 1"
                               size="small"
-                              @click="openMonthDialog(item)"
+                              @click="openMonthDialog(items)"
                               type="primary"
                           >修改医疗类型
                           </el-button>
@@ -354,19 +366,21 @@
                             <div>
 
                               <el-button
-                                  v-if="(hisPatientInfo.id > 0 && items.curMonthPrescriptions.order.id == 0) "
+                                  v-if="(hisPatientInfo.balance_accounts_type != 2 && hisPatientInfo.id > 0 &&  items.curMonthPrescriptions.order.id == 0)"
                                   size="small"
                                   @click="open(8,items.med_type,items.curMonthPrescriptions.order,items.month_prescriptions)"
                                   type="primary"
                               >预结算
                               </el-button>
-                              <!--<el-button-->
-                              <!--v-if="items.curMonthPrescriptions.order.order_status == 1"-->
-                              <!--size="small" @click="open(11)" type="primary"-->
-                              <!--&gt;撤销明细-->
-                              <!--</el-button>-->
+                              <el-button
+                                  v-if="items.curMonthPrescriptions.order.order_status == 1"
+                                  size="small"
+                                  @click="open(11,items.med_type,items.curMonthPrescriptions.order,items.month_prescriptions)"
+                                  type="primary"
+                              >撤销明细
+                              </el-button>
 
-                              <el-button v-loading="loadingtwo"
+                              <el-button
                                          v-if="(hisPatientInfo.id > 0 && items.curMonthPrescriptions.order.id == 0) || items.curMonthPrescriptions.order.order_status == 1 ||  items.curMonthPrescriptions.order.order_status == 3"
                                          size="small"
                                          @click="open(4,items.med_type,items.curMonthPrescriptions.order,items.month_prescriptions)"
@@ -561,32 +575,32 @@
                                 type="primary"
                             >修改医疗类型
                             </el-button>
-                            <div style="margin-bottom:10px;float: right">
-                              <div>
-                                <el-button
-                                    v-if="(hisPatientInfo.id > 0 &&  items.prescriptions[0].order.id == 0)"
-                                    size="small"
-                                    @click="open(8,items.med_type,items.prescriptions[0].order,items.prescriptions)"
-                                    type="primary"
-                                >预结算
-                                </el-button>
-                                <el-button
-                                    v-if="items.curPrescriptions.order.order_status == 1 && hisPatientInfo.balance_accounts_type != 2"
-                                    size="small"
-                                    @click="open(11,items.med_type,items.prescriptions[0].order,items.prescriptions)"
-                                    type="primary"
-                                >撤销明细
-                                </el-button>
-
-
-                                <el-button v-loading="loadingtwo"
-                                           v-if="(hisPatientInfo.id > 0 && items.curPrescriptions.order.id == 0) || items.curPrescriptions.order.order_status == 1 ||  items.curPrescriptions.order.order_status == 3"
-                                           size="small"
-                                           @click="open(4,items.med_type,items.curPrescriptions.order,items.prescriptions)"
-                                           type="primary">收费
-                                </el-button>
-                              </div>
-                            </div>
+<!--                            <div style="margin-bottom:10px;float: right">-->
+<!--                              <div>-->
+<!--                                <el-button-->
+<!--                                    v-if="(hisPatientInfo.id > 0 &&  items.prescriptions[0].order.id == 0)"-->
+<!--                                    size="small"-->
+<!--                                    @click="open(8,items.med_type,items.prescriptions[0].order,items.prescriptions)"-->
+<!--                                    type="primary"-->
+<!--                                >预结算-->
+<!--                                </el-button>-->
+<!--                                <el-button-->
+<!--                                    v-if="items.curPrescriptions.order.order_status == 1 && hisPatientInfo.balance_accounts_type != 2"-->
+<!--                                    size="small"-->
+<!--                                    @click="open(11,items.med_type,items.prescriptions[0].order,items.prescriptions)"-->
+<!--                                    type="primary"-->
+<!--                                >撤销明细-->
+<!--                                </el-button>-->
+
+
+<!--                                <el-button v-loading="loadingtwo"-->
+<!--                                           v-if="(hisPatientInfo.id > 0 && items.curPrescriptions.order.id == 0) || items.curPrescriptions.order.order_status == 1 ||  items.curPrescriptions.order.order_status == 3"-->
+<!--                                           size="small"-->
+<!--                                           @click="open(4,items.med_type,items.curPrescriptions.order,items.prescriptions)"-->
+<!--                                           type="primary">收费-->
+<!--                                </el-button>-->
+<!--                              </div>-->
+<!--                            </div>-->
                           </el-tab-pane>
 
 
@@ -876,6 +890,7 @@ export default {
   },
   data() {
     return {
+      monthChargePatientTableData:[],
       invoiceVisible:false,
       invoiceParams:null,
       temp_med_type: '',
@@ -939,7 +954,9 @@ export default {
         { value: '1112', label: '精二' },
         { value: '9933', label: '门诊特殊病(9933)' },
         { value: '990602', label: '门诊特殊病(990602)' },
-        { value: '1402', label: '门诊特殊病(1402)' }
+        { value: '1402', label: '门诊特殊病(1402)' },
+        { value: '0', label: '自费' }
+
 
       ],
       register_two: [
@@ -948,7 +965,8 @@ export default {
         { value: '9922', label: '家庭通道' },
         { value: '9933', label: '门诊特殊病(9933)' },
         { value: '990602', label: '门诊特殊病(990602)' },
-        { value: '1402', label: '门诊特殊病(1402)' }
+        { value: '1402', label: '门诊特殊病(1402)' },
+        { value: '0', label: '自费' }
 
       ],
       loading: false,
@@ -1138,7 +1156,9 @@ export default {
     },
     openMonthDialog(item) {
       this.dialogVisible = true
+      console.log(item)
       this.temp_month_prescriptions = item
+      console.log(this.temp_month_prescriptions)
     },
     openMonthDialogTwo(item) {
       this.dialogVisible = true
@@ -1266,18 +1286,23 @@ export default {
       cb(results)
     },
     changeTime(val) {
-      let params = {
-        patient_id: this.patientInfo.id,
-        start_time: val,
-        end_time: this.other_end_time,
-        p_type: 2,
-        type: this.radio
+      const params = {
+        'record_date': this.record_date,
+        'patient_id': this.patientInfo.id,
+        'his_patient_id': this.hisPatientInfo.id,
+        'start_time': val,
+        'end_time': this.other_end_time,
+        'type': this.radio,
+        'p_type': 2,
+        'order_id': this.order.id
 
       }
-      getDayOrMonthHisPrescription(params).then(response => {
+      getMonthCharge(params).then(response => {
         if (response.data.state == 1) {
+          this.loading = false
+
           this.month_prescriptions = []
-          this.setMonthPrescription(response.data.data.day_prescription)
+          this.setMonthPrescription(response.data.data.month_prescriptions)
           this.curMonthPrescriptions = this.month_prescriptions[0]
 
         } else {
@@ -1285,19 +1310,26 @@ export default {
         }
       })
 
+
+
     },
     changeEndTime(val) {
-      let params = {
-        patient_id: this.patientInfo.id,
-        start_time: this.other_start_time,
-        end_time: val,
-        p_type: 2
+      const params = {
+        'record_date': this.record_date,
+        'patient_id': this.patientInfo.id,
+        'his_patient_id': this.hisPatientInfo.id,
+        'start_time': this.other_start_time,
+        'end_time': val,
+        'type': this.radio,
+        'p_type': 2,
+        'order_id': this.order.id
 
       }
-      getDayOrMonthHisPrescription(params).then(response => {
+      getMonthCharge(params).then(response => {
         if (response.data.state == 1) {
+          this.loading = false
           this.month_prescriptions = []
-          this.setMonthPrescription(response.data.data.day_prescription)
+          this.setMonthPrescription(response.data.data.month_prescriptions)
           this.curMonthPrescriptions = this.month_prescriptions[0]
 
         } else {
@@ -1422,8 +1454,8 @@ export default {
                   })
 
                 } else {
-                  that.changeRadioAndPatient(2)
                   that.radio = 2
+                  that.changeRadioAndPatient(2)
                   that.$refs.charge.hide()
                   that.loadingtwo = false
                   that.state = '已收费'
@@ -1496,6 +1528,7 @@ export default {
                     }).catch(() => {
                     })
                   } else {
+
                     that.changeRadio(1)
                     that.$refs.register9504.hide()
                     that.$message({ message: '挂号成功', type: 'success' })
@@ -1561,6 +1594,7 @@ export default {
                   })
 
                 } else {
+                  that.radio = 1
                   that.changeRadioAndPatient(1)
                   that.$message({ message: '挂号成功', type: 'success', duration: 5000 })
                   that.$refs.register.hide()
@@ -2185,12 +2219,12 @@ export default {
           'order_id': this.order.id
 
         }
-        getDayOrMonthHisPrescription(params).then(response => {
+        getMonthCharge(params).then(response => {
           if (response.data.state == 1) {
             this.loading = false
 
             this.month_prescriptions = []
-            this.setMonthPrescription(response.data.data.day_prescription)
+            this.setMonthPrescription(response.data.data.month_prescriptions)
             this.curMonthPrescriptions = this.month_prescriptions[0]
 
           } else {
@@ -2680,7 +2714,7 @@ export default {
         }
 
         if (this.hisPatientInfo.id_card_type == 1) {
-          if (this.hisPatientInfo.balance_accounts_type != 2 && this.$store.getters.xt_user.org_id != 10088 && this.$store.getters.xt_user.org_id != 10106 && this.$store.getters.xt_user.org_id != 10188) {
+          if (this.hisPatientInfo.balance_accounts_type != 2 && this.$store.getters.xt_user.org_id != 10088 && this.$store.getters.xt_user.org_id != 10106 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217) {
             this.pwdFormVisible = true
             this.pwd = ''
           } else {
@@ -3053,6 +3087,7 @@ export default {
       this.getPatientList()
     },
     changeRadioAndPatient(id) {
+      this.radio = id
       let params = {
         'record_date': this.record_date
       }
@@ -3537,12 +3572,28 @@ export default {
         num = num.substring(0)
       }
       return parseFloat(num).toFixed(decimal)
+    },getMonthChargePatientList(){
+      let params = {
+        'record_date': this.record_date,
+        'start_time':this.other_start_time,
+        'end_time':this.other_end_time,
+      }
+      getChargeHisPatientList(params).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg)
+          return false
+        } else {
+          this.hisPatientDatas = []
+
+        }
+      })
+
     },
     //患者列表
     getPatientList() {
       let params = {
         'record_date': this.record_date,
-        'type': this.radio
+        'type': this.radio,
       }
       getChargeHisPatientList(params).then(response => {
         if (response.data.state == 0) {
@@ -3948,6 +3999,7 @@ export default {
         big_prescriptions[y]['month_prescriptions'].push(p2)
       }
       this.big_month_prescriptions = big_prescriptions
+      console.log(this.big_month_prescriptions)
 
       for (let i = 0; i < this.big_month_prescriptions.length; i++) {
         if (this.big_month_prescriptions[i].month_prescriptions.length > 0) {
@@ -4011,6 +4063,9 @@ export default {
         case 9922:
           return '家庭通道' + '处方' + index
           break
+        case 0:
+          return '自费' + '处方' + index
+          break
       }
     }, unique_four(array) {
       // res用来存储结果
@@ -4359,45 +4414,8 @@ export default {
             this.hisPatientInfo = response.data.data.his_info
             this.info = response.data.data.info
             this.order = response.data.data.order
-            this.p_type = ''
-            this.sick_type = ''
-            this.diagnosis = []
-            this.sick_history = ''
-            this.form.diagnosis = []
-            if (this.info.id > 0) {
-              this.form.p_type = response.data.data.info.register_type
-              this.form.sick_type = response.data.data.info.sick_type
-              if (response.data.data.info.diagnosis.length == 0) {
-                this.form.diagnosis = []
-              } else {
-                for (let i = 0; i < response.data.data.info.diagnosis.split(',').length; i++) {
-                  this.form.diagnosis.push(parseInt(response.data.data.info.diagnosis.split(',')[i]))
-                }
-              }
-              this.sick_history = this.info.sick_history
-              if (this.info.register_type == 0) {
-                this.form.p_type = ''
-              }
-
-              if (this.info.sick_type == 0) {
-                this.form.sick_type = ''
-              }
-            } else {
-              this.form.p_type = 14
-              this.form.sick_type = this.sick[0].id
-              if (response.data.data.last_info.diagnoses.length == 0) {
-                this.form.diagnosis = []
-              } else {
-                for (let i = 0; i < response.data.data.last_info.diagnosis.split(',').length; i++) {
-                  this.form.diagnosis.push(parseInt(response.data.data.last_info.diagnosis.split(',')[i]))
-                }
-              }
-
-              this.sick_history = ''
-            }
             this.addtions_charge = response.data.data.addtions_charge
             this.setMonthPrescription(response.data.data.month_prescriptions)
-
           }
         })
 

src/xt_pages/outpatientCharges/statementTemplate/printOne.vue

@@ -2,7 +2,7 @@
   <div id="statement-print" class="statement-print">
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10188 || this.$store.getters.xt_user.org_id == 10217">江苏省社会医疗保险医疗费用结算单</div>
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10088">广水源生堂社会医疗保险医疗费用结算单</div>
-    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10088">广东省社会医疗保险医疗费用结算单</div>
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 &&this.$store.getters.xt_user.org_id != 10088">广东省社会医疗保险医疗费用结算单</div>
 
     <table class="statementTable" border="1">
       <tr>
@@ -80,7 +80,7 @@
         <td>单位名称</td>
         <td colspan="5">{{info.emp_name}}</td>
         <td width="80">联系电话</td>
-        <td width="110"></td>
+        <td width="110">{{info.patient.phone}}</td>
         <td width="80">身份证号</td>
         <td colspan="3">{{info.certno}}</td>
       </tr>
@@ -111,9 +111,9 @@
 
 
         <td>入院第一诊断</td>
-        <td colspan="3"></td>
+        <td colspan="3">{{info.dise_name}}</td>
         <td>出院第一诊断</td>
-        <td colspan="4"></td>
+        <td colspan="4">{{info.dise_name}}</td>
       </tr>
       <tr>
         <td>业务类别</td>
@@ -131,6 +131,8 @@
       <tr>
         <td colspan="12" style="text-align:left;padding-left:10px;">
           本次就医：总费用{{info.medfee_sumamt}}元，基金支付{{info.fund_pay_sumamt}}元，个人支付{{info.psn_pay}}元。
+          (起付线 {{info.act_pay_dedc}}元, 先自付 {{info.preselfpay_amt}}元, 段内自付 {{(info.psn_pay - info.preselfpay_amt).toFixed(2)}} )
+
         </td>
       </tr>
       <tr>
@@ -290,7 +292,9 @@
         <td>收款人:</td>
         <td colspan="2">{{info.charge_admin.user_name}}</td>
         <td>审核人:</td>
-        <td colspan="2">{{info.p_admin.user_name}}</td>
+        <td colspan="2" v-if="this.$store.getters.xt_user.org_id == 10106">{{'梅晓辉'}}</td>
+        <td colspan="2" v-if="this.$store.getters.xt_user.org_id != 10106">{{info.p_admin.user_name}}</td>
+
         <td>制单人:</td>
         <td colspan="2">{{info.p_admin.user_name}}</td>
         <td>打印日期</td>

src/xt_pages/outpatientCharges/statementTemplate/printSix.vue

@@ -0,0 +1,396 @@
+<template>
+  <div id="statement-print" class="statement-print">
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10188 || this.$store.getters.xt_user.org_id == 10217">江苏省社会医疗保险医疗费用结算单</div>
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10088">广水源生堂社会医疗保险医疗费用结算单</div>
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 &&this.$store.getters.xt_user.org_id != 10088">广东省社会医疗保险医疗费用结算单</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="100" v-else></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 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 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">{{info.patient.phone}}</td>
+        <td width="80">身份证号</td>
+        <td colspan="3">{{info.certno}}</td>
+      </tr>
+      <tr>
+        <td>住院号</td>
+        <td>{{info.number}}</td>
+        <td>科别</td>
+        <td width="100"></td>
+        <td>床号</td>
+        <td></td>
+        <td>入院日期</td>
+        <td>{{info.begndate ? info.begndate.split(' ')[0] : ''}}</td>
+        <td>出院日期</td>
+        <td width="100">{{info.enddate ? info.enddate.split(' ')[0] : ''}}</td>
+        <td>住院天数</td>
+        <td>{{getDay(info.begndate,info.enddate)}}</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">{{info.dise_name}}</td>
+        <td>出院第一诊断</td>
+        <td colspan="4">{{info.dise_name}}</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 ? info.setl_time.split(' ')[0] : ''}}</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 colspan="3" style="text-align:left;padding-left:10px;">其他基金支付</td>
+        <td colspan="3">{{info.oth_pay}}</td>
+        <td colspan="3" style="text-align:left;padding-left:10px;">个人账户支付</td>
+        <td colspan="3">{{info.acct_pay}}</td>
+      </tr>
+      <tr>
+        <td>收款人:</td>
+        <td colspan="2">{{info.charge_admin.user_name}}</td>
+        <td>审核人:</td>
+        <td colspan="2" v-if="this.$store.getters.xt_user.org_id == 10106">{{'梅晓辉'}}</td>
+        <td colspan="2" v-if="this.$store.getters.xt_user.org_id != 10106">{{info.p_admin.user_name}}</td>
+
+        <td>制单人:</td>
+        <td colspan="2">{{info.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 {}
+      }
+    }, p_admin: {
+      type: Object,
+      default: function() {
+        return {}
+      }
+    }, charge_admin: {
+      type: Object,
+      default: function() {
+        return {}
+      }
+    }
+  },methods:{
+    getDay(dateString1,dateString2){
+      var  startDate = Date.parse(dateString1);
+      var  endDate = Date.parse(dateString2);
+      if (startDate>endDate){
+        return 0;
+      }
+      if (startDate==endDate){
+        return 1;
+      }
+      var days=(endDate - startDate)/(1*24*60*60*1000);
+      return  days;
+
+    },
+    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
+    },
+
+  }
+}
+
+
+</script>
+
+
+<style lang="scss" scoped>
+.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 {
+  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: 14px;
+  border-color: #000;
+}
+</style>

src/xt_pages/outpatientCharges/statementTemplate/privateChargePrint.vue

@@ -0,0 +1,344 @@
+<template>
+  <div id="statement-print" class="statement-print">
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10188 || this.$store.getters.xt_user.org_id == 10217">江苏省社会医疗保险医疗费用结算单</div>
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10088">广水源生堂社会医疗保险医疗费用结算单</div>
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 &&this.$store.getters.xt_user.org_id != 10088">广东省社会医疗保险医疗费用结算单</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"></td>
+      </tr>
+      <tr>
+        <td width="80">姓名</td>
+        <td width="80">{{info.patient.name}}</td>
+        <td width="80">性别</td>
+        <td width="50" v-if="info.patient.gender == 1">男</td>
+        <td width="50" v-if="info.patient.gender == 2">女</td>
+
+        <td width="80">出生日期</td>
+        <td width="100"></td>
+        <td width="90">个人电脑号</td>
+        <td width="110"></td>
+        <td width="80">人员类别</td>
+        <td colspan="3"></td>
+      </tr>
+      <tr>
+        <td>单位名称</td>
+        <td colspan="5"></td>
+        <td width="80">联系电话</td>
+        <td width="110">{{info.patient.phone}}</td>
+        <td width="80">身份证号</td>
+        <td colspan="3">{{info.patient.id_card_no}}</td>
+      </tr>
+      <tr>
+        <td>住院号</td>
+        <td>{{info.number}}</td>
+        <td>科别</td>
+        <td width="100"></td>
+        <td>床号</td>
+        <td></td>
+        <td>入院日期</td>
+        <td>{{info.setl_time ? info.setl_time.split(' ')[0] : ''}}</td>
+        <td>出院日期</td>
+        <td width="100">{{info.setl_time ? info.setl_time.split(' ')[0] : ''}}</td>
+        <td>住院天数</td>
+        <td>{{getDay(info.setl_time.split(' ')[0],info.setl_time.split(' ')[0])}}</td>
+
+      </tr>
+      <tr>
+        <td>险种</td>
+        <td colspan="2"></td>
+
+
+        <td>入院第一诊断</td>
+        <td colspan="3">{{info.diagnosis}}</td>
+        <td>出院第一诊断</td>
+        <td colspan="4">{{info.diagnosis}}</td>
+      </tr>
+      <tr>
+        <td>业务类别</td>
+        <td colspan="5" style="text-align:left;padding-left:10px;"></td>
+
+
+        <td>结算时间</td>
+        <td colspan="5" style="text-align:left;padding-left:10px;">{{info.setl_time ? info.setl_time.split(' ')[0] : ''}}</td>
+      </tr>
+      <tr>
+        <td colspan="12" style="text-align:left;padding-left:10px;">
+<!--          本次就医：总费用{{info.medfee_sumamt}}元，基金支付{{info.fund_pay_sumamt}}元，个人支付{{info.medfee_sumamt}}元。-->
+          本次就医：总费用{{info.medfee_sumamt}}元，基金支付{{info.fund_pay_sumamt}}元，个人支付{{info.psn_pay}}元。
+          (起付线 {{info.act_pay_dedc}}元, 先自付 {{info.preselfpay_amt}}元, 段内自付 {{info.medfee_sumamt}}元 )
+
+        </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"></td>
+        <td colspan="3" style="text-align:left;padding-left:10px;">大额基金支付</td>
+        <td colspan="3"></td>
+      </tr>
+      <tr>
+        <td colspan="3" style="text-align:left;padding-left:10px;">大病基金支付</td>
+        <td colspan="3"></td>
+        <td colspan="3" style="text-align:left;padding-left:10px;">补充保险基金支付</td>
+        <td colspan="3"></td>
+      </tr>
+      <tr>
+        <td colspan="3" style="text-align:left;padding-left:10px;">医疗救助基金支付</td>
+        <td colspan="3"></td>
+        <td colspan="3" style="text-align:left;padding-left:10px;">公务员基金支付</td>
+        <td colspan="3"></td>
+      </tr>
+      <tr>
+        <td colspan="3" style="text-align:left;padding-left:10px;">其他基金支付</td>
+        <td colspan="3"></td>
+        <td colspan="3" style="text-align:left;padding-left:10px;">个人账户支付</td>
+        <td colspan="3"></td>
+      </tr>
+      <tr>
+        <td>收款人:</td>
+        <td colspan="2">{{info.charge_admin.user_name}}</td>
+        <td>审核人:</td>
+        <td colspan="2" v-if="this.$store.getters.xt_user.org_id == 10106">{{'梅晓辉'}}</td>
+        <td colspan="2" v-if="this.$store.getters.xt_user.org_id != 10106">{{info.p_admin.user_name}}</td>
+
+        <td>制单人:</td>
+        <td colspan="2">{{info.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 {}
+      }
+    }, p_admin: {
+      type: Object,
+      default: function() {
+        return {}
+      }
+    }, charge_admin: {
+      type: Object,
+      default: function() {
+        return {}
+      }
+    }
+  },methods:{
+    getDay(dateString1,dateString2){
+      var  startDate = Date.parse(dateString1);
+      var  endDate = Date.parse(dateString2);
+      if (startDate>endDate){
+        return 0;
+      }
+      if (startDate==endDate){
+        return 1;
+      }
+      var days=(endDate - startDate)/(1*24*60*60*1000);
+      return  days;
+
+    },
+    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
+    },
+
+  }
+}
+
+
+</script>
+
+
+<style lang="scss" scoped>
+.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 {
+  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: 14px;
+  border-color: #000;
+}
+</style>

src/xt_pages/outpatientCharges/statementTemplate/test.vue

@@ -0,0 +1,400 @@
+<template>
+  <div id="statement-print" class="statement-print">
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10188 || this.$store.getters.xt_user.org_id == 10217">江苏省社会医疗保险医疗费用结算单</div>
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10088">广水源生堂社会医疗保险医疗费用结算单</div>
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 &&this.$store.getters.xt_user.org_id != 10088">广东省社会医疗保险医疗费用结算单</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="100" v-else></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 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 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">{{info.patient.phone}}</td> -->
+        <td>13535320234</td>
+        <td width="80">身份证号</td>
+        <td colspan="3">{{info.certno}}</td>
+      </tr>
+      <tr>
+        <td>住院号</td>
+        <td>{{info.number}}</td>
+        <td>科别</td>
+        <td width="100"></td>
+        <td>床号</td>
+        <td></td>
+        <td>入院日期</td>
+        <td>{{info.begndate ? info.begndate.split(' ')[0] : ''}}</td>
+        <td>出院日期</td>
+        <td width="100">{{info.enddate ? info.enddate.split(' ')[0] : ''}}</td>
+        <td>住院天数</td>
+        <td>{{getDay(info.begndate,info.enddate)}}</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">{{info.dise_name}}</td>
+        <td>出院第一诊断</td>
+        <td colspan="4">{{info.dise_name}}</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 ? info.setl_time.split(' ')[0] : ''}}</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 colspan="3" style="text-align:left;padding-left:10px;">其他基金支付</td>
+        <td colspan="3">{{info.oth_pay}}</td>
+        <td colspan="3" style="text-align:left;padding-left:10px;">个人账户支付</td>
+        <td colspan="3">{{info.acct_pay}}</td>
+      </tr>
+      <tr>
+        <td>收款人:</td>
+        <!-- <td colspan="2">{{info.charge_admin.user_name}}</td> -->
+        <td colspan="2">高慧与</td> 
+        <td>审核人:</td>
+        <td colspan="2" v-if="this.$store.getters.xt_user.org_id == 10106">{{'梅晓辉'}}</td>
+        <!-- <td colspan="2" v-if="this.$store.getters.xt_user.org_id != 10106">{{info.p_admin.user_name}}</td> -->
+        <td colspan="2">梅晓辉</td>
+        <td>制单人:</td>
+        <!-- <td colspan="2">{{info.p_admin.user_name}}</td> -->
+        <td colspan="2">梅晓辉</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 rowspan="2">
+        <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 {}
+        }
+      }, p_admin: {
+        type: Object,
+        default: function() {
+          return {}
+        }
+      }, charge_admin: {
+        type: Object,
+        default: function() {
+          return {}
+        }
+      }
+    },methods:{
+      getDay(dateString1,dateString2){
+          var  startDate = Date.parse(dateString1);
+          var  endDate = Date.parse(dateString2);
+          if (startDate>endDate){
+            return 0;
+          }
+          if (startDate==endDate){
+            return 1;
+          }
+          var days=(endDate - startDate)/(1*24*60*60*1000);
+          return  days;
+
+        },
+      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
+      },
+
+    }
+  }
+
+
+</script>
+
+
+<style lang="scss" scoped>
+  .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 {
+    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: 14px;
+    border-color: #000;
+  }
+</style>

src/xt_pages/outpatientDoctorStation/batch_print_checkTemplate/index.vue

@@ -13,7 +13,7 @@
       </template> -->
 
       <div class='dialysisPage' style="padding-top:40px;">
-        <printOne :printData="printData"></printOne>
+        <printOne :printData="printData" ref="printOne"></printOne>
       </div>
   </div>
 </template>
@@ -66,13 +66,11 @@ export default {
                 scanStyles: false
             });
         },500)
-
     },
     getAllDoctorList(){
       getAllDoctorList().then(response=>{
         if(response.data.state == 1){
                var doctor =  response.data.data.doctor
-
                this.doctorList = doctor
              }
          })
@@ -85,6 +83,7 @@ export default {
 
   created() {
     this.org_id = this.$store.getters.xt_user.org_id
+    console.log('oo')
   },
 
 };

src/xt_pages/outpatientDoctorStation/batch_print_checkTemplate/printOne.vue

@@ -1,464 +1,555 @@
 <template>
-    <div>
-        <div id='prescription-print3' class="prescription-print">
-          <div v-for="(i,index) in printData">
-<!--            <img style="width:100%;height:80px" v-if="org_id == 10138" src="https://kuyi.shengws.com/bailin/bltotle.jpg" alt="">-->
-<!--/*             <img style="width:100%;height:80px" v-if="org_id == 10278" src="https://kuyi.shengws.com/bailinbeier.png" alt="">*/-->
-            <div class="printTitle">检验申请单</div>
-
-            <div style="border:1px solid #000;">
-                <div style="display:flex;justify-content: space-between;border-bottom:1px solid #000;line-height:40px;padding:0 10px;">
-                    <div>是否急诊：否</div>
-                    <div>结算方式：{{ i.his_patient.id != 0 ? i.his_patient.balance_accounts_type == 1 ? '医保' : '自费' : '' }}</div>
-                    <div>金额：{{ total }}</div>
-                </div>
-                <div style="display:flex;justify-content: space-between;border-bottom:1px solid #000;line-height:40px;padding:0 10px;">
-                    <div>姓名：{{i.his_patient.id != 0?i.his_patient.name:i.name}}</div>
-                    <div>性别：
-                        <span v-if="i.his_patient.id != 0">
-                          <span v-if="i.his_patient.gend == 1">男</span>
-                          <span v-if="i.his_patient.gend == 2">女</span>
-                        </span>
-                        <span v-else>
-                          <span v-if="i.gender == 1">男</span>
-                          <span v-if="i.gender == 2">女</span>
-                        </span>
-                    </div>
-                    <div>年龄：{{i.age?i.age:""}}岁</div>
-                </div>
-                <!-- <div style="margin-bottom:20px;padding:10px 10px 0;">病史摘要：{{history.history_of_present_illness?history.history_of_present_illness:''}}</div> -->
-                <!-- <div style="margin-bottom:20px;padding:0 10px;">体格检查：
+  <div id="prescriptionPrint" class="prescription-print">
+    <div
+      v-for="(i, index) in printData"
+      :key="index"
+      style="
+        box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27),
+          0 0 40px rgba(0, 0, 0, 0.06) inset;
+      "
+    >
+      <!--            <img style="width:100%;height:80px" v-if="org_id == 10138" src="https://kuyi.shengws.com/bailin/bltotle.jpg" alt="">-->
+      <!--/*             <img style="width:100%;height:80px" v-if="org_id == 10278" src="https://kuyi.shengws.com/bailinbeier.png" alt="">*/-->
+      <div
+        id="prescription-print"
+        class="prescription-print"
+        style="page-break-after: always"
+        v-for="(item, index) in i.prescriptions"
+        :key="index"
+      >
+        <div class="printTitle">检验申请单</div>
+
+        <div style="border: 1px solid #000">
+          <div
+            style="
+              display: flex;
+              justify-content: space-between;
+              border-bottom: 1px solid #000;
+              line-height: 40px;
+              padding: 0 10px;
+            "
+          >
+            <div>是否急诊：否</div>
+            <div>
+              结算方式：{{
+                i.his_patient.id != 0
+                  ? i.his_patient.balance_accounts_type == 1
+                    ? "医保"
+                    : "自费"
+                  : ""
+              }}
+            </div>
+            <div
+              v-for="item in getSingleTeam(i.prescriptions)"
+              :key="item"
+              style="margin-bottom: 10px"
+            >
+              金额：{{ item }}
+            </div>
+          </div>
+          <div
+            style="
+              display: flex;
+              justify-content: space-between;
+              border-bottom: 1px solid #000;
+              line-height: 40px;
+              padding: 0 10px;
+            "
+          >
+            <div>
+              姓名：{{ i.his_patient.id != 0 ? i.his_patient.name : i.name }}
+            </div>
+            <div>
+              性别：
+              <span v-if="i.his_patient.id != 0">
+                <span v-if="i.his_patient.gend == 1">男</span>
+                <span v-if="i.his_patient.gend == 2">女</span>
+              </span>
+              <span v-else>
+                <span v-if="i.gender == 1">男</span>
+                <span v-if="i.gender == 2">女</span>
+              </span>
+            </div>
+            <div>年龄：{{ i.age ? i.age : "" }}岁</div>
+          </div>
+          <!-- <div style="margin-bottom:20px;padding:10px 10px 0;">病史摘要：{{history.history_of_present_illness?history.history_of_present_illness:''}}</div> -->
+          <!-- <div style="margin-bottom:20px;padding:0 10px;">体格检查：
                     <span>体温：{{ history.temperature ? history.temperature + '℃' : '/' }}</span>
                     <span>脉搏：{{ history.pulse ? history.pulse + '次/分' : '/' }}</span>
                     <span>呼吸：{{ history.breathing ? history.breathing + '次/分' : '/' }}</span>
                     <span>血压：{{ history.sbp }}/{{ history.dbp }}mmHg</span>
                 </div> -->
-                <div style="margin:20px 0;padding:0 10px;">临床诊断：{{getDiagnosis(i.info.diagnosis)}}</div>
-                <div style="display:flex;margin-bottom:20px;padding:0 10px;">
-                    <div>检验项目：</div>
-                    <div>
-                        <div v-for="item in getTeam(i.prescriptions)" style="margin-bottom:10px;">{{ item.team.project_team }}</div>
-                        <div v-for="item in getSingleTeam(i.prescriptions)" style="margin-bottom:10px;">{{ item.project.project_name }}</div>
-                    </div>
-                </div>
-                <div style="display:flex;justify-content: space-between;border-top:1px solid #000;line-height:40px;padding:0 10px;">
-                    <div>开单医生：{{ i.info.doctor ? i.info.doctor : '' }}</div>
-                    <div>开单日期：
-                        {{getTime(i.info.ctime) ? getTime(i.info.ctime).split(' ')[0] : ''}}
-                    </div>
-                    <div>医生签字：{{ i.info.doctor ? i.info.doctor : '' }}</div>
-                </div>
+          <div style="margin: 20px 0; padding: 0 10px">
+            临床诊断：{{ getDiagnosis(i.info.diagnosis) }}
+          </div>
+          <div style="display: flex; margin-bottom: 20px; padding: 0 10px">
+            <div>检验项目：</div>
+            <div>
+              <div
+                v-for="item in getTeam(i.prescriptions)"
+                :key="item.id"
+                style="margin-bottom: 10px"
+              >
+                {{ item.team.project_team }}
+              </div>
+            </div>
+          </div>
+          <div
+            style="
+              display: flex;
+              justify-content: space-between;
+              border-top: 1px solid #000;
+              line-height: 40px;
+              padding: 0 10px;
+            "
+          >
+            <div>开单医生：{{ i.info.doctor ? i.info.doctor : "" }}</div>
+            <div>
+              开单日期：
+              {{
+                getTime(i.info.ctime) ? getTime(i.info.ctime).split(" ")[0] : ""
+              }}
             </div>
-<!--            <img style="width:100%;" v-if="org_id == 10138" src="https://kuyi.shengws.com/bailin/blend.jpg" alt="">-->
-<!--            <img style="width:100%;" v-if="org_id == 10278" src="https://kuyi.shengws.com/bailinbeier.png" alt="">-->
+            <div>医生签字：{{ i.info.doctor ? i.info.doctor : "" }}</div>
+          </div>
         </div>
+        <!--            <img style="width:100%;" v-if="org_id == 10138" src="https://kuyi.shengws.com/bailin/blend.jpg" alt="">-->
+        <!--            <img style="width:100%;" v-if="org_id == 10278" src="https://kuyi.shengws.com/bailinbeier.png" alt="">-->
       </div>
     </div>
-
+  </div>
 </template>
 <script>
-import { jsGetAge, uParseTime } from '@/utils/tools'
-import {getAllDoctorList} from "@/api/project/project"
-import {getInitData} from "@/api/his/his"
+import { jsGetAge, uParseTime } from "@/utils/tools";
+import { getAllDoctorList } from "@/api/project/project";
+import { getInitData } from "@/api/his/his";
 export default {
-    props:{
-      printData:Array
+  props: {
+    printData: Array,
+  },
+  data() {
+    return {
+      doctorList: [],
+      advicePrint: {},
+      patient: {},
+      tableData: [],
+      prescriptionInfo: [],
+      hisPatient: {},
+      department: [],
+      prescriptions: [],
+      projectList: [],
+      orgname: "",
+      diagnoses: [],
+      pageArr: [],
+      faber: {},
+      total: 0,
+      projectPrint: [],
+      time: "",
+      doctor: "",
+      org_id: "",
+      singleProjectPrint: [],
+      total_copy: [],
+    };
+  },
+
+  methods: {
+    getAllDoctorList() {
+      getAllDoctorList().then((response) => {
+        if (response.data.state == 1) {
+          var doctor = response.data.data.doctor;
+
+          this.doctorList = doctor;
+        }
+      });
     },
-    data(){
-      return {
-        doctorList:[],
-        advicePrint:{},
-        patient:{},
-        tableData:[],
-        prescriptionInfo:[],
-        hisPatient:{},
-        department:[],
-        prescriptions:[],
-        projectList:[],
-        orgname:"",
-        diagnoses:[],
-        pageArr:[],
-        faber:{},
-        total:0,
-        projectPrint:[],
-        time:'',
-        doctor:'',
-        org_id:'',
-        singleProjectPrint:[]
+    getDoctor(id) {
+      var name = "";
+      for (let i = 0; i < this.doctorList.length; i++) {
+        if (id == this.doctorList[i].admin_user_id) {
+          name = this.doctorList[i].user_name;
+        }
       }
+      return name;
+    },
+    getTime(value, temp) {
+      if (value != undefined) {
+        return uParseTime(value, temp);
+      }
+      return "";
     },
-   methods:{
-     getAllDoctorList(){
-      getAllDoctorList().then(response=>{
-        if(response.data.state == 1){
-               var doctor =  response.data.data.doctor
-
-               this.doctorList = doctor
-             }
-         })
-     },
-     getDoctor(id){
-        var name = ""
-        for(let i=0;i<this.doctorList.length;i++){
-          if(id == this.doctorList[i].admin_user_id){
-              name = this.doctorList[i].user_name
-          }
-        }
-        return name
-      },
-     getTime(value, temp) {
-        if (value != undefined) {
-            return uParseTime(value, temp)
-        }
-        return ''
-     },
-     getTeam(prescriptions){
-        let projectPrint = []
-        let total = 0
-        prescriptions.map(item => {
-          if(item.project.length > 0){
-              item.project.map(it => {
-                    if(it.type == 2){
-                        if(it.project.cost_classify == 3){
-                            projectPrint.push(it)
-                            total += (it.project.price*parseInt(it.count))
-                        }
-                    }
-              })
 
+    getTeam(prescriptions, isUpdate = false) {
+      let projectPrint = [];
+      prescriptions.forEach((item) => {
+        // ！此为修改前的处理方法，因考虑到可能有逻辑错误的存在故注释，若后续需求以这个为准可放开此条！
+        // if (item.project.length > 0) {
+        //   item.project.map((it) => {
+        //     if (it.type == 2) {
+        //       if (it.project.cost_classify == 3) {
+        //         projectPrint.push(it);
+        //       }
+        //     }
+        //   });
+        // }
+
+        if (item.project.length > 0) {
+          item.project.map((it) => {
+            projectPrint.push(it);
+          });
+        }
+      });
+
+      let data = [];
+      projectPrint.map((item) => {
+        console.log(item, "999");
+        if (item.team.id == 0) {
+          data.push(item);
+        } else {
+          let status = data.some((it) => it.team.id == item.team.id);
+          if (!status) {
+            data.push(item);
           }
-        })
-        let data = []
-        projectPrint.map(item => {
-          if(item.team.id != 0){
-            let status = data.some(it => (it.team.id == item.team.id))
-            if(!status){
-              data.push(item)
-            }
-          }
-
-        })
-
-        this.total = total.toFixed(2)
-        this.projectPrint = data
-        return data
-     },
-     getSingleTeam(prescriptions){
-        let projectPrint = []
-        let total = 0
-        prescriptions.map(item => {
-          if(item.project.length > 0){
-              item.project.map(it => {
-                    if(it.type == 2){
-                        if(it.project.cost_classify == 3){
-                            projectPrint.push(it)
-                            total += (it.project.price*parseInt(it.count))
-                        }
-                    }
-              })
+        }
+      });
+      if (isUpdate) {
+        this.projectPrint = data;
+      }
+      return data;
+    },
 
-          }
-        })
-        let data = []
-        projectPrint.map(item => {
-          if(item.team.id == 0){
-                data.push(item)
+    // 计算金额(单独从上面的方法割开来，防止进入死循环)
+    getSingleTeam(prescriptions) {
+      let projectPrint = [];
+      let total = 0;
+      prescriptions.map((item) => {
+        if (item.project.length > 0) {
+          item.project.map((it) => {
+            if (it.type == 2) {
+              if (it.project.cost_classify == 3) {
+                projectPrint.push(it);
+                total += it.project.price * parseInt(it.count);
               }
+            }
+          });
+        }
+      });
+      let total_copy = [];
+      total_copy.push(total.toFixed(2));
+      return total_copy;
+    },
 
-        })
-
-        this.total = total.toFixed(2)
-        return data
-     },
-
-     getInitData(){
-       getInitData().then(response=>{
-          if(response.data.state == 1){
-            this.department = response.data.data.department
-            this.diagnoses = response.data.data.diagnose.sort(this.compare('id'))
-          }
-       })
-     },
-     getDepart(id){
-         var name = ""
-       for(let i=0;i<this.department.length;i++){
-           if(id == this.department[i].id){
-               name = this.department[i].name
-           }
-       }
-       return name
-     },
+    getInitData() {
+      getInitData().then((response) => {
+        if (response.data.state == 1) {
+          this.department = response.data.data.department;
+          this.diagnoses = response.data.data.diagnose.sort(this.compare("id"));
+        }
+      });
+    },
+    getDepart(id) {
+      var name = "";
+      for (let i = 0; i < this.department.length; i++) {
+        if (id == this.department[i].id) {
+          name = this.department[i].name;
+        }
+      }
+      return name;
+    },
     getTotalOne(id) {
-
-        var total = 0
-        var addtotal = 0
-        for (let i = 0; i < this.prescriptions.length; i++) {
-          if(id == this.prescriptions[i].id){
-            if (this.prescriptions[i].project != null) {
-              for (let a = 0; a < this.prescriptions[i].project.length; a++) {
-                total = total + this.prescriptions[i].project[a].price * this.prescriptions[i].project[a].count
-              }
+      var total = 0;
+      var addtotal = 0;
+      for (let i = 0; i < this.prescriptions.length; i++) {
+        if (id == this.prescriptions[i].id) {
+          if (this.prescriptions[i].project != null) {
+            for (let a = 0; a < this.prescriptions[i].project.length; a++) {
+              total =
+                total +
+                this.prescriptions[i].project[a].price *
+                  this.prescriptions[i].project[a].count;
             }
+          }
 
-            if (this.prescriptions[i].additionalcharge != null) {
-              for (let a = 0; a < this.prescriptions[i].additionalcharge.length; a++) {
-                addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
-              }
+          if (this.prescriptions[i].additionalcharge != null) {
+            for (
+              let a = 0;
+              a < this.prescriptions[i].additionalcharge.length;
+              a++
+            ) {
+              addtotal =
+                addtotal +
+                this.prescriptions[i].additionalcharge[a].price *
+                  this.prescriptions[i].additionalcharge[a].count;
             }
-              addtotal =  Math.floor(addtotal * 100) / 100
+          }
+          addtotal = Math.floor(addtotal * 100) / 100;
         }
-
-       }
+      }
 
       for (let i = 0; i < this.prescriptions.length; i++) {
-          if(id == this.prescriptions[i].id){
-            if (this.prescriptions[i].advices != null) {
-              for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
-                total = total + this.prescriptions[i].advices[a].price * this.prescriptions[i].advices[a].prescribing_number
-              }
+        if (id == this.prescriptions[i].id) {
+          if (this.prescriptions[i].advices != null) {
+            for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
+              total =
+                total +
+                this.prescriptions[i].advices[a].price *
+                  this.prescriptions[i].advices[a].prescribing_number;
             }
+          }
 
-            if (this.prescriptions[i].additionalcharge != null) {
-              for (let a = 0; a < this.prescriptions[i].additionalcharge.length; a++) {
-                addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
-              }
+          if (this.prescriptions[i].additionalcharge != null) {
+            for (
+              let a = 0;
+              a < this.prescriptions[i].additionalcharge.length;
+              a++
+            ) {
+              addtotal =
+                addtotal +
+                this.prescriptions[i].additionalcharge[a].price *
+                  this.prescriptions[i].additionalcharge[a].count;
             }
-              addtotal =  Math.floor(addtotal * 100) / 100
+          }
+          addtotal = Math.floor(addtotal * 100) / 100;
         }
-       }
+      }
 
-        return total + addtotal
-      },
+      return total + addtotal;
+    },
 
-     getProjectName(id){
-        var project_name = ""
-        for(let i=0;i<this.projectList.length;i++){
-           if(id == this.projectList[i].id){
-               project_name = this.projectList[i].project_name
-           }
+    getProjectName(id) {
+      var project_name = "";
+      for (let i = 0; i < this.projectList.length; i++) {
+        if (id == this.projectList[i].id) {
+          project_name = this.projectList[i].project_name;
         }
-        return project_name
-     },
-
-     getDiagnosis(ids){
-        let newIds = ids.split(',').sort(function(a,b){
-          return a-b;
-        })
-
-        let nameArr = []
-        for(let i=0;i<this.diagnoses.length;i++){
-          if(newIds.indexOf(this.diagnoses[i].id.toString()) > -1){
-            // name += diagnoses[i].class_name + ' '
-            nameArr.push(this.diagnoses[i].class_name)
-          }
+      }
+      return project_name;
+    },
+
+    getDiagnosis(ids) {
+      let newIds = ids.split(",").sort(function (a, b) {
+        return a - b;
+      });
+
+      let nameArr = [];
+      for (let i = 0; i < this.diagnoses.length; i++) {
+        if (newIds.indexOf(this.diagnoses[i].id.toString()) > -1) {
+          // name += diagnoses[i].class_name + ' '
+          nameArr.push(this.diagnoses[i].class_name);
         }
-        let newNameArr = []
-        nameArr.map((item,index) => {
-          if(item == '尿毒症'){
-            newNameArr.push(item)
-            nameArr.splice(index,1,'')
-          }
-        })
-        newNameArr.push(...nameArr)
-        return newNameArr.join(' ')
-     },
-     compare(property) {
-        return function(a,b){
-          var value1 = a[property];
-          var value2 = b[property];
-          return value1 - value2;//升序排序
+      }
+      let newNameArr = [];
+      nameArr.map((item, index) => {
+        if (item == "尿毒症") {
+          newNameArr.push(item);
+          nameArr.splice(index, 1, "");
         }
-      },
-     getPage(){
-        this.page = 1
-        this.pageArr = []
-
-        this.advicePrint.map(item => {
-          let arr = []
-          item.pageArr = []
-          if(item.advices.length <= 5){
-            this.page = 1
-            arr.push(item.advices.length)
-            item.pageArr.push(arr)
-
-          }else if(item.advices.length > 5){
-            this.page = parseInt(item.advices.length / 5)
-            let num = item.advices.length % 5
-            for (var i=0;i<this.page;i++){
-              item.pageArr.push([5])
-            }
-            if(num != 0){
-              item.pageArr.push([num])
-            }
+      });
+      newNameArr.push(...nameArr);
+      return newNameArr.join(" ");
+    },
+
+    compare(property) {
+      return function (a, b) {
+        var value1 = a[property];
+        var value2 = b[property];
+        return value1 - value2; //升序排序
+      };
+    },
+    getPage() {
+      this.page = 1;
+      this.pageArr = [];
+
+      this.advicePrint.map((item) => {
+        let arr = [];
+        item.pageArr = [];
+        if (item.advices.length <= 5) {
+          this.page = 1;
+          arr.push(item.advices.length);
+          item.pageArr.push(arr);
+        } else if (item.advices.length > 5) {
+          this.page = parseInt(item.advices.length / 5);
+          let num = item.advices.length % 5;
+          for (var i = 0; i < this.page; i++) {
+            item.pageArr.push([5]);
           }
-        })
-        // console.log('this.pageArr',this.pageArr)
-      },
-      getName(list) {
-        console.log('list',list)
-        let new_list = []
-        for (let i = 0; i < list.length; i++) {
-          if (list[i].aac031 == '1') {
-            new_list.push(list[i])
+          if (num != 0) {
+            item.pageArr.push([num]);
           }
         }
-
-        switch (new_list[0].bcc334) {
-          case "A31001":
-            return "深圳医保1档"
-            break
-          case "A31002":
-            return "深圳医保2档"
-
-            break
-          case "A31003":
-            return "深圳医保3档"
-
-            break
-          case "A31004":
-            return "二档（少儿）"
-
-            break
-          case "A31005":
-            return "学生二档"
-
-            break
-          case "A31006":
-            return "大学生二档"
-
-            break
-          case "A32001":
-            return "在职公务员"
-            break
-          case "A32002":
-            return "在职驻深公务员"
-
-            break
-          case "A39301":
-            return "家属统筹医疗"
-
-            break
-          case "A41001":
-            return "工伤在职"
-
-            break
-          case "A51001":
-            return "生育在职"
-
-            break
-          case "A52001":
-            return "生育医疗一档"
-
-            break
-          case "A52002":
-            return "生育医疗一档"
-
-            break
-          case "C31001":
-            return "一档医疗退休"
-
-            break
-          case "C31002":
-            return "二档医疗退休"
-            break
-
+      });
+      // console.log('this.pageArr',this.pageArr)
+    },
+    getName(list) {
+      console.log("list", list);
+      let new_list = [];
+      for (let i = 0; i < list.length; i++) {
+        if (list[i].aac031 == "1") {
+          new_list.push(list[i]);
         }
+      }
 
-
-
-      },
-
-   },
-   created(){
-      // this.getAllDoctorList()
-      this.getInitData()
-      // this.getPrescriptionPrint()
-      // this.getHisPatientDetail()
-      // this.getPatientCaseHistory()
-      var xtuser = this.$store.getters.xt_user;
-      this.orgname = xtuser.org.org_name;
-      this.org_id = this.$store.getters.xt_user.org_id
-
-   },
-   watch:{
-     ids:function(val){
-      this.ids = val
-      this.getPrescriptionPrint()
-    }
-   }
-}
+      switch (new_list[0].bcc334) {
+        case "A31001":
+          return "深圳医保1档";
+          break;
+        case "A31002":
+          return "深圳医保2档";
+
+          break;
+        case "A31003":
+          return "深圳医保3档";
+
+          break;
+        case "A31004":
+          return "二档（少儿）";
+
+          break;
+        case "A31005":
+          return "学生二档";
+
+          break;
+        case "A31006":
+          return "大学生二档";
+
+          break;
+        case "A32001":
+          return "在职公务员";
+          break;
+        case "A32002":
+          return "在职驻深公务员";
+
+          break;
+        case "A39301":
+          return "家属统筹医疗";
+
+          break;
+        case "A41001":
+          return "工伤在职";
+
+          break;
+        case "A51001":
+          return "生育在职";
+
+          break;
+        case "A52001":
+          return "生育医疗一档";
+
+          break;
+        case "A52002":
+          return "生育医疗一档";
+
+          break;
+        case "C31001":
+          return "一档医疗退休";
+
+          break;
+        case "C31002":
+          return "二档医疗退休";
+          break;
+      }
+    },
+  },
+  created() {
+    // this.getAllDoctorList()
+    this.getInitData();
+    // this.getPrescriptionPrint()
+    // this.getHisPatientDetail()
+    // this.getPatientCaseHistory()
+    var xtuser = this.$store.getters.xt_user;
+    this.orgname = xtuser.org.org_name;
+    this.org_id = this.$store.getters.xt_user.org_id;
+  },
+  watch: {
+    ids: function (val) {
+      this.ids = val;
+      this.getPrescriptionPrint();
+    },
+    // printData: {
+    //   immediate: true,
+    //   deep: true,
+    //   handler(val) {
+    //     console.log(val, "val");
+    //     val.forEach((el) => {
+    //       this.getTeam(el.prescriptions, true);
+    //     });
+    //   },
+    // },
+  },
+};
 </script>
 
 
 <style lang="scss" scoped>
-.prescription-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;
+.prescription-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;
 }
-.printTitle{
-    font-size: 22px;
-    text-align: center;
-    font-weight: bold;
-    margin-bottom: 10px;
+.printTitle {
+  font-size: 22px;
+  text-align: center;
+  font-weight: bold;
+  margin-bottom: 10px;
 }
-.infoTitle{
-    display: flex;
-    margin-top:10px;
-    line-height: 24px;
+.infoTitle {
+  display: flex;
+  margin-top: 10px;
+  line-height: 24px;
 }
-.infoTitle div{
-    width: 200px;
+.infoTitle div {
+  width: 200px;
 }
-.infoMain{
-    display: flex;
-    flex-wrap: wrap;
-    margin-top:10px;
+.infoMain {
+  display: flex;
+  flex-wrap: wrap;
+  margin-top: 10px;
 }
-.infoMain div{
-    width: 50%;
-    line-height: 24px;
+.infoMain div {
+  width: 50%;
+  line-height: 24px;
 }
-.prescriptionBox{
-    padding:0 10px;
-    min-height:400px;
+.prescriptionBox {
+  padding: 0 10px;
+  min-height: 400px;
 }
-.Rp{
-    font-size: 22px;
-    font-weight: bold;
+.Rp {
+  font-size: 22px;
+  font-weight: bold;
 }
-.drugsBox{
-    padding-left: 40px;
-    margin-bottom: 10px;
+.drugsBox {
+  padding-left: 40px;
+  margin-bottom: 10px;
 }
-.drugsBox div{
-    line-height: 20px;
+.drugsBox div {
+  line-height: 20px;
 }
-.drugsOne{
-    line-height: 24px;
+.drugsOne {
+  line-height: 24px;
 }
-.drugsOne span{
-    margin-right: 20px;
+.drugsOne span {
+  margin-right: 20px;
 }
-.doctorBox{
-    display: flex;
-    justify-content: space-between;
-    padding:0 10px;
-    line-height: 24px;
-    border-bottom: 2px solid #000;
+.doctorBox {
+  display: flex;
+  justify-content: space-between;
+  padding: 0 10px;
+  line-height: 24px;
+  border-bottom: 2px solid #000;
 }
-.actionBar{
-    display: flex;
-    justify-content: space-between;
-    line-height: 24px;
-    padding:0 10px;
+.actionBar {
+  display: flex;
+  justify-content: space-between;
+  line-height: 24px;
+  padding: 0 10px;
 }
-.actionBar p{
-    width:150px;
+.actionBar p {
+  width: 150px;
 }
-.under_line{
+.under_line {
   display: inline-block;
   border-bottom: 1px solid #000;
   flex: 1;

src/xt_pages/outpatientDoctorStation/batch_print_template/index.vue

@@ -67,7 +67,7 @@ export default {
        patient_id:"",
        prescription_id:"",
        ids:'',
-       paramsObj:{},
+      //  paramsObj:{},
        org_id:''
     };
   },
@@ -148,7 +148,6 @@ export default {
       this.patient_id = row.patient_id
       this.record_date = this.record_date
       this.prescription_id = this.prescription_id
-      console.log("row",row)
         // var params = {
         //   patient_id:row.patient_id,
         //   record_date:this.record_date,
@@ -178,21 +177,17 @@ export default {
   },
 
   created() {
-    this.org_id = this.$store.getters.xt_user.org_id
-    this.getAllDoctorList()
-    var record_date = this.paramsObj.record
-    this.record_date = record_date
-    console.log("record_date",record_date)
-    var prescription_id = this.paramsObj.prescription_id
-    this.prescription_id = prescription_id
-    this.patient_id = this.paramsObj.patient_id
-    this.ids = this.paramsObj.ids
-    // var record_date = this.$route.query.record
+    // console.log(this.paramsObj,'打印测试')
+    // this.org_id = this.$store.getters.xt_user.org_id
+    // this.getAllDoctorList()
+    // var record_date = this.paramsObj.record
     // this.record_date = record_date
     // console.log("record_date",record_date)
-    // var prescription_id = this.$route.query.prescription_id
+    // var prescription_id = this.paramsObj.prescription_id
     // this.prescription_id = prescription_id
-    this.getAllHisPatientList(record_date)
+    // this.patient_id = this.paramsObj.patient_id
+    // this.ids = this.paramsObj.ids
+    // this.getAllHisPatientList(record_date)
   },
   watch:{
     // paramsObj:{//深度监听，可监听到对象、数组的变化

src/xt_pages/outpatientDoctorStation/batch_print_template/printOne.vue

@@ -1,340 +1,451 @@
 <template>
-  <div id='prescriptionPrint'>
-    <div v-for="(i,index) in printData">
-      <div v-for="(item,index) in i.prescriptions" :key="index">
-        <div id='prescription-print' class="prescription-print" style="page-break-after: always;">
-            <div class="printTitle" v-if="item.med_type == '1111'">{{orgname}}第一类精神处方笺</div>
-            <div class="printTitle"  v-if="item.med_type == '1112'">{{orgname}}第二类精神处方笺</div>
-            <div class="printTitle" v-if="item.med_type != '1111' && item.med_type != '1112'">{{orgname}}处方笺</div>
-            <!--<div class="printTitle">{{orgname}}处方笺</div>-->
-            <div class="infoTitle">
-                <p>姓名：{{i.his_patient.id != 0?i.his_patient.name:i.name}}</p>
-                <p>性别：
-                  <span>
-                    <span v-if="i.gender == 1">男</span>
-                    <span v-if="i.gender == 2">女</span>
-                  </span>
-                </p>
-                <p>年龄：{{i.his_patient.id != 0?getAge(i.his_patient):i.age}}岁</p>
+  <div id="prescriptionPrint">
+    <div v-for="(i, index) in printData" :key="index">
+      <div v-for="(item, index) in i.prescriptions" :key="index">
+        <div
+          id="prescription-print"
+          class="prescription-print"
+          style="page-break-after: always"
+        >
+          <div class="printTitle" v-if="item.med_type == '1111'">
+            {{ orgname }}第一类精神处方笺
+          </div>
+          <div class="printTitle" v-if="item.med_type == '1112'">
+            {{ orgname }}第二类精神处方笺
+          </div>
+          <div
+            class="printTitle"
+            v-if="item.med_type != '1111' && item.med_type != '1112'"
+          >
+            {{ orgname }}处方笺
+          </div>
+          <!--<div class="printTitle">{{orgname}}处方笺</div>-->
+          <div class="infoTitle">
+            <p>
+              姓名：{{ i.his_patient.id != 0 ? i.his_patient.name : i.name }}
+            </p>
+            <p>
+              性别：
+              <span>
+                <span v-if="i.gender == 1">男</span>
+                <span v-if="i.gender == 2">女</span>
+              </span>
+            </p>
+            <p>
+              年龄：{{
+                i.his_patient.id != 0 ? getAge(i.his_patient) : i.age
+              }}岁
+            </p>
+          </div>
+          <div class="infoMain">
+            <div style="margin-bottom: 10px">
+              门诊号：{{ i.his_patient.id != 0 ? i.his_patient.number : "" }}
             </div>
-            <div class="infoMain">
-                <div style="margin-bottom: 10px;">门诊号：{{i.his_patient.id != 0?i.his_patient.number:""}}</div>
-                <div style="margin-bottom: 10px;">科室：{{i.his_patient.id != 0?getDepart(i.his_patient.departments):''}}</div>
-                <div style="margin-bottom: 10px;">医保卡号：{{i.his_patient.id != 0?i.his_patient.id_card_no:""}}</div>
-                <div style="margin-bottom: 10px;" v-if="org_id != 10188">电话：{{i.phone}}</div>
-                <div style="margin-bottom: 10px;" v-else>日期：{{getTime(i.info.ctime)?getTime(i.info.ctime):""}}</div>
-                <div>地址：{{i.home_address}}</div>
-                <div style="display:flex;width:50%;">临床诊断：{{getDiagnosis(i.info.diagnosis)}}</div>
+            <div style="margin-bottom: 10px">
+              科室：{{
+                i.his_patient.id != 0
+                  ? getDepart(i.his_patient.departments)
+                  : ""
+              }}
             </div>
-            <div class="prescriptionBox">
-                <div class="Rp">Rp:</div>
-                <div class="drugsBox" v-for="(it,index) in item.advices" :key="index">
-                    <!-- <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div> -->
-                    <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;<span v-if="it.drug.min_unit != it.drug.dose_unit">{{it.drug.dose}}{{it.drug.dose_unit}}&nbsp;* &nbsp;</span>{{it.drug.min_number}}{{it.drug.min_unit}}/{{it.drug.max_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div>
-                    <div style="margin-left:100px;"><span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.execution_frequency}}&nbsp;{{it.delivery_way}}&nbsp;</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
-                </div>
-                <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
-                  <div class="drugsOne">{{it.item_name?it.item_name:""}}:&nbsp;{{it.price}}元/{{it.count}}次</div>
-                </div>
-
-                <div class="drugsBox" v-for="(it,index) in item.project" :key="index">
-                    <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.type == 2?getProjectName(it.project_id)?getProjectName(it.project_id):"":it.good_info.good_name}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.count}}{{unit}}</div>
-                    <div style="margin-left:100px;"><span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.delivery_way}}</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
-                </div>
-                <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
-                  <div class="drugsOne">{{it.project_id?it.project_id:""}}:&nbsp;{{it.price.toFixed(2)}}元/{{it.count}}次</div>
-                </div>
-                <div style="text-align:center;" >(以下空白)</div>
-
+            <div style="margin-bottom: 10px">
+              医保卡号：{{
+                i.his_patient.id != 0 ? i.his_patient.id_card_no : ""
+              }}
+            </div>
+            <div style="margin-bottom: 10px" v-if="org_id != 10188">
+              电话：{{ i.phone }}
+            </div>
+            <div style="margin-bottom: 10px" v-else>
+              日期：{{ getTime(i.info.ctime) ? getTime(i.info.ctime) : "" }}
+            </div>
+            <div>地址：{{ i.home_address }}</div>
+            <div style="display: flex; width: 50%">
+              临床诊断：{{ getDiagnosis(i.info.diagnosis)}}
+            </div>
+          </div>
+          <div class="prescriptionBox">
+            <div class="Rp">Rp:</div>
+            <div
+              class="drugsBox"
+              v-for="(it, index) in item.advices"
+              :key="index"
+            >
+              <!-- <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div> -->
+              <div class="drugsOne">
+                <span style="font-weight: bold">{{ index + 1 + "." }}</span
+                >{{ it.advice_name ? it.advice_name : "" }}&nbsp;&nbsp;<span
+                  v-if="it.drug.min_unit != it.drug.dose_unit"
+                  >{{ it.drug.dose }}{{ it.drug.dose_unit }}&nbsp;* &nbsp;</span
+                >{{ it.drug.min_number }}{{ it.drug.min_unit }}/{{
+                  it.drug.max_unit
+                }}&nbsp;×&nbsp; {{ it.prescribing_number
+                }}{{ it.prescribing_number_unit }}
+              </div>
+              <div style="margin-left: 100px">
+                <span>用法：{{ it.single_dose }}{{ it.single_dose_unit }}</span
+                >&nbsp;&nbsp;<span
+                  >{{ it.execution_frequency }}&nbsp;{{
+                    it.delivery_way
+                  }}&nbsp;</span
+                >&nbsp;&nbsp;<span>{{ it.advice_desc }}</span>
+              </div>
             </div>
-            <div class="doctorBox" v-if="org_id != 10188">
-                <p>医师：{{i.info.doctor?i.info.doctor:""}}</p>
-                <p>日期：{{getTime(i.info.ctime)?getTime(i.info.ctime):""}}</p>
+            <div
+              class="drugsBox"
+              v-for="(it, i) in item.additionalcharge"
+              :key="i"
+            >
+              <div class="drugsOne">
+                {{ it.item_name ? it.item_name : "" }}:&nbsp;{{ it.price }}元/{{
+                  it.count
+                }}次
+              </div>
             </div>
-            <div class="doctorBox" v-else>
-              <p>药师：</p>
-              <p>医师：{{i.info.doctor?i.info.doctor:""}}</p>
+
+            <div
+              class="drugsBox"
+              v-for="(it, index) in item.project"
+              :key="index"
+            >
+              <div class="drugsOne">
+                <span style="font-weight: bold">{{ index + 1 + "." }}</span
+                >{{
+                  it.type == 2
+                    ? getProjectName(it.project_id)
+                      ? getProjectName(it.project_id)
+                      : ""
+                    : it.good_info.good_name
+                }}&nbsp;&nbsp;{{ it.single_dose
+                }}{{ it.single_dose_unit }}&nbsp;×&nbsp; {{ it.count
+                }}{{ unit }}
+              </div>
+              <div style="margin-left: 100px">
+                <span>用法：{{ it.single_dose }}{{ it.single_dose_unit }}</span
+                >&nbsp;&nbsp;<span>{{ it.delivery_way }}</span
+                >&nbsp;&nbsp;<span>{{ it.advice_desc }}</span>
+              </div>
+            </div>
+            <div
+              class="drugsBox"
+              v-for="(it, i) in item.additionalcharge"
+              :key="i"
+            >
+              <div class="drugsOne">
+                {{ it.project_id ? it.project_id : "" }}:&nbsp;{{
+                  it.price.toFixed(2)
+                }}元/{{ it.count }}次
+              </div>
             </div>
-            <div class="actionBar" v-if="org_id != 10188">
-                  <!-- <p>审核：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
+            <div style="text-align: center">(以下空白)</div>
+          </div>
+          <div class="doctorBox" v-if="org_id != 10188">
+            <p>医师：{{ i.info.doctor ? i.info.doctor : "" }}</p>
+            <p>
+              日期：{{ getTime(i.info.ctime) ? getTime(i.info.ctime) : "" }}
+            </p>
+          </div>
+          <div class="doctorBox" v-else>
+            <p>药师：</p>
+            <p>医师：{{ i.info.doctor ? i.info.doctor : "" }}</p>
+          </div>
+          <div class="actionBar" v-if="org_id != 10188">
+            <!-- <p>审核：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
                   <p>配对：</p>
                   <p>核对：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
                   <p>发药：{{getDoctor(item.advices[0].execution_staff)?getDoctor(item.advices[0].execution_staff):""}}</p>
                   <p>药费：{{getTotalOne(item.id)?getTotalOne(item.id):0}}元</p> -->
 
-                  <p>审核：</p>
-                  <p>配对：</p>
-                  <p>核对：</p>
-                  <p>发药：</p>
-                  <p>药费：{{getTotalOne(item.advices).toFixed(2)?getTotalOne(item.advices).toFixed(2):0}}元</p>
-  <!--            <p>药费：466.2元</p>-->
-
-            </div>
-            <div class="actionBar" v-else>
-              <p style="visibility: hidden;">审核：</p>
-              <p style="visibility: hidden;">配对：</p>
-              <p style="visibility: hidden;">核对：</p>
-              <p style="visibility: hidden;">发药：</p>
-              <p>药费：{{getTotalOne(item.advices).toFixed(2)?getTotalOne(item.advices).toFixed(2):0}}元</p>
-  <!--            <p>药费：551.2元</p>-->
-  <!--            <p>药费：466.2元</p>-->
-
-
-            </div>
-            <div style="page-break-after:always"></div>
+            <p>审核：</p>
+            <p>配对：</p>
+            <p>核对：</p>
+            <p>发药：</p>
+            <p>
+              药费：{{
+                getTotalOne(item.advices).toFixed(2)
+                  ? getTotalOne(item.advices).toFixed(2)
+                  : 0
+              }}元
+            </p>
+            <!--            <p>药费：466.2元</p>-->
+          </div>
+          <div class="actionBar" v-else>
+            <p style="visibility: hidden">审核：</p>
+            <p style="visibility: hidden">配对：</p>
+            <p style="visibility: hidden">核对：</p>
+            <p style="visibility: hidden">发药：</p>
+            <p>
+              药费：{{
+                getTotalOne(item.advices).toFixed(2)
+                  ? getTotalOne(item.advices).toFixed(2)
+                  : 0
+              }}元
+            </p>
+            <!--            <p>药费：551.2元</p>-->
+            <!--            <p>药费：466.2元</p>-->
+          </div>
+          <div style="page-break-after: always"></div>
         </div>
       </div>
     </div>
   </div>
-
-
 </template>
 <script>
-import { jsGetAge, uParseTime } from '@/utils/tools'
-import {getAllDoctorList,getPrescriptionPrint,getHisPatientDetail} from "@/api/project/project"
-import {getInitData} from "@/api/his/his"
+import { jsGetAge, uParseTime } from "@/utils/tools";
+import {
+  getAllDoctorList,
+  getPrescriptionPrint,
+  getHisPatientDetail,
+} from "@/api/project/project";
+import { getInitData } from "@/api/his/his";
 export default {
-    props:{
-      patient_id:Number,
-      record_date:String,
-      prescription_id:Number,
-      ids:String,
-      printData:Array
-    },
-    data(){
-      return {
-        doctorList:[],
-        advicePrint:{},
-        patient:{},
-        tableData:[],
-        prescriptionInfo:[],
-        hisPatient:{},
-        department:[],
-        prescriptions:[],
-        projectList:[],
-        orgname:"",
-        diagnoses:[],
-        org_id: 0
+  props: {
+    patient_id: String,
+    record_date: String,
+    prescription_id: String,
+    ids: String,
+    printData: Array,
+  },
+  data() {
+    return {
+      doctorList: [],
+      advicePrint: {},
+      patient: {},
+      tableData: [],
+      prescriptionInfo: [],
+      hisPatient: {},
+      department: [],
+      prescriptions: [],
+      projectList: [],
+      orgname: "",
+      diagnoses: [],
+      org_id: 0,
+    };
+  },
+  methods: {
+    getAge(patient) {
+      var thisLen = patient.id_card_no.length;
+      var birth = "";
+      if (thisLen == 15) {
+        birth = "19" + patient.id_card_no.substr(6, 6);
+      } else {
+        birth = patient.id_card_no.substr(6, 8);
       }
+      var births =
+        birth.substr(0, 4) +
+        "-" +
+        birth.substr(4, 2) +
+        "-" +
+        birth.substr(6, 2);
+      return jsGetAge(births, "-");
     },
-   methods:{
-     getAge(patient){
-       var thisLen = patient.id_card_no.length
-       var birth = ''
-       if (thisLen == 15) {
-         birth = '19' + patient.id_card_no.substr(6, 6)
-       } else {
-         birth = patient.id_card_no.substr(6, 8)
-       }
-       var births =
-         birth.substr(0, 4) +
-         '-' +
-         birth.substr(4, 2) +
-         '-' +
-         birth.substr(6, 2)
-       return jsGetAge(births, '-')
-
-     },
 
-     getAllDoctorList(){
-      getAllDoctorList().then(response=>{
-        if(response.data.state == 1){
-               var doctor =  response.data.data.doctor
+    getAllDoctorList() {
+      getAllDoctorList().then((response) => {
+        if (response.data.state == 1) {
+          var doctor = response.data.data.doctor;
 
-               this.doctorList = doctor
-             }
-         })
-     },
+          this.doctorList = doctor;
+        }
+      });
+    },
 
-      getDoctor(id){
-        var name = ""
-        for(let i=0;i<this.doctorList.length;i++){
-          if(id == this.doctorList[i].admin_user_id){
-              name = this.doctorList[i].user_name
-          }
+    getDoctor(id) {
+      var name = "";
+      for (let i = 0; i < this.doctorList.length; i++) {
+        if (id == this.doctorList[i].admin_user_id) {
+          name = this.doctorList[i].user_name;
         }
-        return name
-      },
-      getTime(value, temp) {
-        if (value != undefined) {
-            return uParseTime(value, temp)
+      }
+      return name;
+    },
+    getTime(value, temp) {
+      if (value != undefined) {
+        return uParseTime(value, temp);
+      }
+      return "";
+    },
+    getPrescriptionPrint() {
+      var params = {
+        // patient_id:this.patient_id,
+        // record_date:this.record_date,
+        // prescription_id:this.prescription_id,
+        patient_id: this.patient_id,
+        record_date: this.record_date,
+        prescription_id: this.prescription_id,
+        ids: this.ids,
+      };
+      console.log("params", params);
+      getPrescriptionPrint(params).then((response) => {
+        if (response.data.state == 1) {
+          var advicePrint = response.data.data.advicePrint;
+          console.log("adviceprint9999", advicePrint);
+          this.advicePrint = advicePrint;
+          this.prescriptions = advicePrint;
+          console.log("处方222222", this.prescriptions);
+          var hisPatient = response.data.data.hisPatient;
+          console.log("hisPatient", hisPatient);
+          this.hisPatient = hisPatient;
+          var projectlist = response.data.data.projectlist;
+          console.log("所有项目列表", projectlist);
+          this.projectList = projectlist;
         }
-        return ''
-     },
-       getPrescriptionPrint(){
-         var params = {
-          // patient_id:this.patient_id,
-          // record_date:this.record_date,
-          // prescription_id:this.prescription_id,
-          patient_id:this.patient_id,
-          record_date:this.record_date,
-          prescription_id:this.prescription_id,
-          ids:this.ids
+      });
+    },
+    getHisPatientDetail() {
+      const params = {
+        patient_id: this.patient_id,
+      };
+      getHisPatientDetail(params).then((response) => {
+        if (response.data.state == 1) {
+          var hisPatient = response.data.data.hisPatient;
+          console.log("挂号病人", hisPatient);
+          this.hisPatient = hisPatient;
         }
-        console.log("params",params)
-       getPrescriptionPrint(params).then(response=>{
-         if(response.data.state == 1){
-            var advicePrint =  response.data.data.advicePrint
-            console.log("adviceprint9999",advicePrint)
-            this.advicePrint = advicePrint
-            this.prescriptions = advicePrint
-            console.log("处方222222",this.prescriptions)
-            var hisPatient = response.data.data.hisPatient
-            console.log("hisPatient",hisPatient)
-            this.hisPatient = hisPatient
-            var projectlist =  response.data.data.projectlist
-            console.log("所有项目列表",projectlist)
-            this.projectList = projectlist
-          }
-       })
-     },
-     getHisPatientDetail(){
-          const params = {
-              patient_id:this.patient_id
-          }
-       getHisPatientDetail(params).then(response=>{
-          if(response.data.state == 1){
-             var hisPatient =  response.data.data.hisPatient
-             console.log("挂号病人",hisPatient)
-             this.hisPatient = hisPatient
-          }
-       })
-     },
-     getInitData(){
-       getInitData().then(response=>{
-          if(response.data.state == 1){
-            this.department = response.data.data.department
-            this.diagnoses = response.data.data.diagnose
-            console.log("争端",this.diagnoses)
-          }
-       })
-     },
-     getDepart(id){
-         var name = ""
-       for(let i=0;i<this.department.length;i++){
-           if(id == this.department[i].id){
-               name = this.department[i].name
-           }
-       }
-       return name
-     },
+      });
+    },
+    getInitData() {
+      getInitData().then((response) => {
+        if (response.data.state == 1) {
+          this.department = response.data.data.department;
+          this.diagnoses = response.data.data.diagnose;
+          console.log("争端", this.diagnoses);
+        }
+      });
+    },
+    getDepart(id) {
+      var name = "";
+      for (let i = 0; i < this.department.length; i++) {
+        if (id == this.department[i].id) {
+          name = this.department[i].name;
+        }
+      }
+      return name;
+    },
     getTotalOne(advices) {
-      let total = 0
-      advices.map(item => {
-        total += item.price * item.prescribing_number
-      })
-      return total
+      let total = 0;
+      advices.map((item) => {
+        total += item.price * item.prescribing_number;
+      });
+      return total;
     },
 
-     getProjectName(id){
-        var project_name = ""
-        for(let i=0;i<this.projectList.length;i++){
-           if(id == this.projectList[i].id){
-               project_name = this.projectList[i].project_name
-           }
+    getProjectName(id) {
+      var project_name = "";
+      for (let i = 0; i < this.projectList.length; i++) {
+        if (id == this.projectList[i].id) {
+          project_name = this.projectList[i].project_name;
         }
-        return project_name
-     },
+      }
+      return project_name;
+    },
+
+    getDiagnosis(id) {
+      let id_ = id.split(",");
+      let nameArr = [];
+      let name = "";
 
-     getDiagnosis(id){
-        var name = ""
-        for(let i=0;i<this.diagnoses.length;i++){
-          if(id == this.diagnoses[i].id){
-             name = this.diagnoses[i].class_name
+      for (let i = 0; i < this.diagnoses.length; i++) {
+        for (let j = 0; j < id_.length; j++) {
+          if (id_[j] == this.diagnoses[i].id) {
+            nameArr[j] = this.diagnoses[i].class_name;
+            name = nameArr.join(',')
           }
         }
-        return name
-     }
-
-   },
-   created(){
-      console.log('this.printData',this.printData)
-      // this.getAllDoctorList()
-      this.getInitData()
-      // this.getPrescriptionPrint()
-      // this.getHisPatientDetail()
-      var xtuser = this.$store.getters.xt_user;
-      this.orgname = xtuser.org.org_name;
-      this.org_id = xtuser.org.id
-   },
-   watch:{
-     ids:function(val){
-      this.ids = val
+      }
+      return name;
+    },
+  },
+  created() {
+    console.log("this.printData", this.printData);
+    // this.getAllDoctorList()
+    this.getInitData();
+    // this.getPrescriptionPrint()
+    // this.getHisPatientDetail()
+    var xtuser = this.$store.getters.xt_user;
+    this.orgname = xtuser.org.org_name;
+    this.org_id = xtuser.org.id;
+  },
+  watch: {
+    ids: function (val) {
+      this.ids = val;
       // this.getPrescriptionPrint()
-    }
-   }
-}
+    },
+  },
+};
 </script>
 
 
 <style lang="scss" scoped>
-.prescription-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;
+.prescription-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;
 }
-.printTitle{
-    font-size: 22px;
-    text-align: center;
-    font-weight: bold;
+.printTitle {
+  font-size: 22px;
+  text-align: center;
+  font-weight: bold;
 }
-.infoTitle{
-    display: flex;
-    border-bottom: 2px solid #000;
-    margin-top:10px;
-    line-height: 24px;
-    padding:0 10px;
+.infoTitle {
+  display: flex;
+  border-bottom: 2px solid #000;
+  margin-top: 10px;
+  line-height: 24px;
+  padding: 0 10px;
 }
-.infoTitle p{
-    width: 200px;
+.infoTitle p {
+  width: 200px;
 }
-.infoMain{
-    display: flex;
-    flex-wrap: wrap;
-    border-bottom: 2px solid #000;
-    padding:0 10px;
+.infoMain {
+  display: flex;
+  flex-wrap: wrap;
+  border-bottom: 2px solid #000;
+  padding: 0 10px;
 }
-.infoMain div{
-    width: 50%;
-    line-height: 24px;
+.infoMain div {
+  width: 50%;
+  line-height: 24px;
 }
-.prescriptionBox{
-    padding:0 10px;
-    min-height:450px;
+.prescriptionBox {
+  padding: 0 10px;
+  min-height: 450px;
 }
-.Rp{
-    font-size: 22px;
-    font-weight: bold;
+.Rp {
+  font-size: 22px;
+  font-weight: bold;
 }
-.drugsBox{
-    padding-left: 40px;
-    margin-bottom: 10px;
+.drugsBox {
+  padding-left: 40px;
+  margin-bottom: 10px;
 }
-.drugsBox div{
-    line-height: 20px;
+.drugsBox div {
+  line-height: 20px;
 }
-.drugsOne{
-    line-height: 24px;
+.drugsOne {
+  line-height: 24px;
 }
-.drugsOne span{
-    margin-right: 20px;
+.drugsOne span {
+  margin-right: 20px;
 }
-.doctorBox{
-    display: flex;
-    justify-content: space-between;
-    padding:0 10px;
-    line-height: 24px;
-    border-bottom: 2px solid #000;
+.doctorBox {
+  display: flex;
+  justify-content: space-between;
+  padding: 0 10px;
+  line-height: 24px;
+  border-bottom: 2px solid #000;
 }
-.actionBar{
-    display: flex;
-    justify-content: space-between;
-    line-height: 24px;
-    padding:0 10px;
+.actionBar {
+  display: flex;
+  justify-content: space-between;
+  line-height: 24px;
+  padding: 0 10px;
 }
-.actionBar p{
-    width:150px;
+.actionBar p {
+  width: 150px;
 }
 </style>

src/xt_pages/outpatientDoctorStation/batch_print_treatTemplate/printOne.vue

@@ -35,7 +35,7 @@
                 </div>
                 <div style="margin-bottom: 10px;width:25%">参保类型：{{i.his_patient.id != 0?i.his_patient.social_type:''}}
                 </div>
-                <div style="margin-bottom: 10px;width:50%;">联系电话：{{i.his_patient.id != 0 ? i.his_patient.phone_number : i.phone}}</div>
+                <div style="margin-bottom: 10px;width:50%;">联系电话：{{i.his_patient.id != 0 ? i.his_patient.phone : i.phone}}</div>
                 <div style="width:50%;">地址：{{i.home_address}}</div>
                 <div style="width:100%;">诊断：{{getDiagnosis(i.info.diagnosis)}}</div>
             </div>
@@ -261,6 +261,13 @@
         diagnoses: []
       }
     },
+
+    watch:{
+      printData:function(val){
+        console.log(val,'打印props')
+      }
+    },
+
     methods: {
       getAge(patient){
         var thisLen = patient.id_card_no.length
@@ -375,13 +382,18 @@
         })
       },
       getDiagnosis(id) {
-        var name = ''
-        for (let i = 0; i < this.diagnoses.length; i++) {
-          if (id == this.diagnoses[i].id) {
-            name = this.diagnoses[i].class_name
+      let id_ = id.split(",");
+      let nameArr = [];
+      let name = "";
+      for (let i = 0; i < this.diagnoses.length; i++) {
+        for (let j = 0; j < id_.length; j++) {
+          if (id_[j] == this.diagnoses[i].id) {
+            nameArr[j] = this.diagnoses[i].class_name;
+            name = nameArr.join(',')
           }
         }
-        return name
+      }
+      return name;
       }
     },
     created() {

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -287,6 +287,7 @@
                                         <el-table-column label="库存" width="60">
                                             <template slot-scope="scope">
                                               <!-- <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id == 10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id ==9956 || org_id == 10188 || org_id == 10191 || org_id == 10278">
+                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id == 10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id ==9956 || org_id == 10188 || org_id == 10191 || org_id == 10278 || org_id == 10217">
                                                <span v-if="scope.row.count/scope.row.min_number>0">{{Math.floor(scope.row.count/scope.row.min_number)}}{{scope.row.max_unit}}</span>
                                                <span v-if="scope.row.count%scope.row.min_number>0"> {{scope.row.count%scope.row.min_number}}{{scope.row.min_unit}}</span>
                                               </span>
@@ -298,8 +299,8 @@
                                         </el-table-column>
                                         <el-table-column label="单价" width="40">
                                             <template slot-scope="scope">
-                                              <span v-if="scope.row.batch_retai_price >0">{{scope.row.batch_retai_price}}</span> 
-                                              <span v-else>{{ scope.row.min_price }}</span> 
+                                              <span v-if="scope.row.batch_retai_price >0">{{scope.row.batch_retai_price}}</span>
+                                              <span v-else>{{ scope.row.min_price }}</span>
                                            </template>
                                         </el-table-column>
                                     </el-table>
@@ -389,6 +390,7 @@
                                         <el-table-column label="库存" width="40">
                                             <template slot-scope="scope">
                                               <!-- <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id == 10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10188 || org_id == 10191 || org_id == 10278">
+                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id == 10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10188 || org_id == 10191 || org_id == 10278 || org_id == 10217">
                                                    {{scope.row.stock_count}}
                                               </span>
                                               <span v-else> {{ scope.row.total }}</span> -->
@@ -544,6 +546,10 @@
           { value: 1111, label: '精一' },
           { value: 1112, label: '精二' },
           { value: 9922, label: '家庭通道' },
+          { value: 9933, label: '门诊特殊病(9933)' },
+          { value: 990602, label: '门诊特殊病(990602)' },
+          { value: 1402, label: '门诊特殊病(1402)' },
+          { value: 0, label: '自费' }
 
 
 
@@ -1359,9 +1365,7 @@
         this.$emit('setData', this.prescriptions)
 
       }, changevalue(val) {
-
         this.$forceUpdate()
-
       },
       callCancel() {
         this.$refs.call_prescription.close()
@@ -2223,12 +2227,12 @@
                 }
               }
             }
-            for (let i = 0; i < this.prescriptions.length; i++) {
-              if (this.prescriptions[i].med_type == 0 || this.prescriptions[i].med_type == '') {
-                this.$message.error('处方医疗类型不能为空')
-                return
-              }
-            }
+            // for (let i = 0; i < this.prescriptions.length; i++) {
+            //   if (this.prescriptions[i].med_type == 0 || this.prescriptions[i].med_type == '') {
+            //     this.$message.error('处方医疗类型不能为空')
+            //     return
+            //   }
+            // }
             if (index == 1) {
               console.log(this.prescriptions)
 
@@ -2711,6 +2715,37 @@
         //       return
         //     }
         // }
+        console.log('selection', selection)
+        console.log('row', row)
+        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10188 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 || this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191 || this.org_id == 10278 || this.org_id == 10217){
+            if (row.count <= 0) {
+              if (selection) {
+                selection.forEach(row => {
+                  if (row.count <= 0) {
+                    this.$refs.multipleTable.toggleRowSelection(row)
+                  }
+                })
+              } else {
+                this.$refs.multipleTable.clearSelection()
+              }
+              this.$message.error(row.drug_name + '库存不足')
+              return
+            }
+        }else{
+           if (row.total <= 0) {
+              if (selection) {
+                selection.forEach(row => {
+                  if (row.total <= 0) {
+                    this.$refs.multipleTable.toggleRowSelection(row)
+                  }
+                })
+              } else {
+                this.$refs.multipleTable.clearSelection()
+              }
+              this.$message.error(row.drug_name + '库存不足')
+              return
+            }
+        }
 
         this.curDrugs = selection
       },
@@ -2970,7 +3005,7 @@
                 this.$message.error(row.project_name + '库存不足')
                 return
               })
-          }  
+          }
         }
         // if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10188 || this.org_id ==10245 || this.org_id == 9919  || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 ||  this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191 || this.org_id == 10278){
         //    if (row.stock_count <= 0) {
@@ -3004,6 +3039,39 @@
         //       return
         //     }
         //   }
+        console.log('row', row)
+        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10188 || this.org_id ==10245 || this.org_id == 9919  || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 ||  this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191 || this.org_id == 10278 || this.org_id == 10217){
+           if (row.stock_count <= 0) {
+            if (row.type == 3) {
+              if (selection) {
+                selection.forEach(row => {
+                  if (row.stock_count <= 0) {
+                    this.$refs.tables.toggleRowSelection(row)
+                  }
+                })
+              } else {
+                this.$refs.tables.clearSelection()
+              }
+              this.$message.error(row.project_name + '库存不足')
+              return
+            }
+          }
+        }else{
+           if (row.total <= 0) {
+            if (row.type == 3) {
+              if (selection) {
+                selection.forEach(row => {
+                  if (row.total <= 0) {
+                    this.$refs.tables.toggleRowSelection(row)
+                  }
+                })
+              } else {
+                this.$refs.tables.clearSelection()
+              }
+              this.$message.error(row.project_name + '库存不足')
+              return
+            }
+          }
 
         // }
         this.teamList.push(row)
@@ -3044,11 +3112,17 @@
 
             for (let i = 0; i < good_info.length; i++) {
                good_info[i].stock_count = 0
-               
+
                if(good_info[i].batch_retai_price > 0){
                   good_info[i].packing_price = 0
                   good_info[i].packing_price = good_info[i].batch_retai_price
                }
+              if(good_info[i].good_stock_in&&good_info[i].good_stock_in.length >0 ){
+                for(let j=0;j<good_info[i].good_stock_in.length;j++){
+                   good_info[i].stock_count += good_info[i].good_stock_in[j].stock_count
+                }
+              }
+               console.log("耗材列表2323232322332",good_info)
               let obj = {
                 id: good_info[i].id,
                 project_name: good_info[i].good_name,
@@ -3071,7 +3145,7 @@
               }
               this.tabProject.push(obj)
             }
-           
+
             console.log("猎豹33323232323223323223233223",this.tabProject)
             this.allProject = this.tabProject
 

src/xt_pages/outpatientDoctorStation/pastInquiries.vue

@@ -1,45 +1,116 @@
 <template>
   <div class="main-contain">
     <div class="position">
-      <bread-crumb :crumbs='crumbs'></bread-crumb>
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
     </div>
     <div class="app-container">
       <div class="cell clearfix">
-        <el-input size="small" style="width:150px;" v-model="keywords"
-                  class="filter-item"/>
-        <el-button size="small" style="margin:0 10px;" class="filter-item" type="primary" @click="searchAction">搜索
+        <el-input
+          size="small"
+          style="width: 150px"
+          v-model="keywords"
+          class="filter-item"
+        />
+        <el-button
+          size="small"
+          style="margin: 0 10px"
+          class="filter-item"
+          type="primary"
+          @click="searchAction"
+          >搜索
         </el-button>
-        <el-date-picker v-model="record_date" prefix-icon="el-icon-date" @change="handleScheduleDateChange"
-                        :editable="false" :clearable="false" style="width: 196px;margin-right:10px;" type="date"
-                        format="yyyy-MM-dd"
-                        value-format="yyyy-MM-dd"
-                        placeholder="选择日期时间" align="right"></el-date-picker>
-       <el-button size="small" style="margin:0 10px;" class="filter-item" type="primary" @click="batchPrint(1)">处方筏批量打印</el-button>
-        <el-button size="small" style="margin:0 10px;" class="filter-item" type="primary" @click="batchPrint(2)">治疗单批量打印</el-button>
-        <el-button size="small" style="margin:0 10px;" class="filter-item" type="primary" @click="batchPrint(3)">检验单批量打印</el-button>
+        <el-date-picker
+          v-model="record_date"
+          prefix-icon="el-icon-date"
+          @change="handleScheduleDateChange"
+          :editable="false"
+          :clearable="false"
+          style="width: 196px; margin-right: 10px"
+          type="date"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          placeholder="选择日期时间"
+          align="right"
+        ></el-date-picker>
+        <el-button
+          size="small"
+          style="margin: 0 10px"
+          class="filter-item"
+          type="primary"
+          @click="batchPrint(1)"
+          >处方筏批量打印</el-button
+        >
+        <el-button
+          size="small"
+          style="margin: 0 10px"
+          class="filter-item"
+          type="primary"
+          @click="batchPrint(2)"
+          >治疗单批量打印</el-button
+        >
+        <el-button
+          size="small"
+          style="margin: 0 10px"
+          class="filter-item"
+          type="primary"
+          @click="batchPrint(3)"
+          >检验单批量打印</el-button
+        >
       </div>
-      <el-table :data="tableData" border ref="table" style="width: 100%;" :row-style="{ color: '#303133' }" @selection-change="handleSelectionChange"
-                :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-        <el-table-column align="center" type="selection" width="55"></el-table-column>
-        <el-table-column align="center" label="序号" width="60" type="index"></el-table-column>
+      <el-table
+        :data="tableData"
+        border
+        ref="table"
+        style="width: 100%"
+        :row-style="{ color: '#303133' }"
+        @selection-change="handleSelectionChange"
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266',
+        }"
+        highlight-current-row
+      >
+        <el-table-column
+          align="center"
+          type="selection"
+          width="55"
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          label="序号"
+          width="60"
+          type="index"
+        ></el-table-column>
         <el-table-column align="center" prop="name" label="姓名" width="100">
-          <template slot-scope="scope">{{scope.row.patients?scope.row.patients.name:''}}</template>
+          <template slot-scope="scope">{{
+            scope.row.patients ? scope.row.patients.name : ""
+          }}</template>
         </el-table-column>
-        <el-table-column align="center" prop="name" label="处方日期" width="200">
-          <template slot-scope="scope"> {{getTimes(scope.row.ctime)}}</template>
-
+        <el-table-column
+          align="center"
+          prop="name"
+          label="处方日期"
+          width="200"
+        >
+          <template slot-scope="scope">
+            {{ getTimes(scope.row.ctime) }}</template
+          >
         </el-table-column>
         <!--<el-table-column align="center" prop="name" label="患者类型">-->
-          <!--<template slot-scope="scope">{{}}</template>-->
+        <!--<template slot-scope="scope">{{}}</template>-->
         <!--</el-table-column>-->
         <el-table-column align="center" prop="name" label="处方号">
-          <template slot-scope="scope">{{scope.row.prescription_number}}</template>
+          <template slot-scope="scope">{{
+            scope.row.prescription_number
+          }}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="开立医生">
-          <template slot-scope="scope">{{scope.row.doctor}}</template>
+          <template slot-scope="scope">{{ scope.row.doctor }}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="诊断">
-          <template slot-scope="scope">{{getDiagnosis(scope.row.diagnosis)}}</template>
+          <template slot-scope="scope">{{
+            getDiagnosis(scope.row.diagnosis)
+          }}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="状态" width="100">
           <template slot-scope="scope">
@@ -49,7 +120,12 @@
         </el-table-column>
         <el-table-column align="center" prop="name" label="操作" width="100">
           <template slot-scope="scope">
-            <el-button size="mini" type="primary" @click="handerShowDetail(scope.row)">详情</el-button>
+            <el-button
+              size="mini"
+              type="primary"
+              @click="handerShowDetail(scope.row)"
+              >详情</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
@@ -59,239 +135,317 @@
         :page-sizes="[10, 50, 100]"
         :page-size="10"
         background
-        style="margin-top:20px;float: right"
+        style="margin-top: 20px; float: right"
         layout="total, sizes, prev, pager, next, jumper"
         :total="total"
       >
       </el-pagination>
       <inquiries-detail ref="inquiriesDetail"></inquiries-detail>
       <el-dialog
-          class="centerDialog"
-          width="600px"
-          title="打印"
-          :visible.sync="innerVisible"
-          append-to-body>
+        class="centerDialog"
+        width="600px"
+        title="打印"
+        :visible.sync="innerVisible"
+        append-to-body
+      >
         <template>
           <el-button
-              style="float:right;"
-              size="small"
-              icon="el-icon-printer"
-              @click="printThisPage"
-              type="primary"
-          >打印
+            style="float: right"
+            size="small"
+            icon="el-icon-printer"
+            @click="printThisPage(printData)"
+            type="primary"
+            >打印
           </el-button>
         </template>
-        <div id='printMain'>
-          <print ref="print" v-if="printType == 1" :printData='printData'></print>
-          <treatPrint ref="treatPrint" v-if="printType == 2" :printData='printData'></treatPrint>
-          <checkPrint ref="checkPrint" v-if="printType == 3" :printData='printData'></checkPrint>
+        <div id="printMain">
+          <print
+            ref="print"
+            v-if="printType == 1"
+            :printData="printData"
+          ></print>
+          <treatPrint
+            ref="treatPrint"
+            v-if="printType == 2"
+            :printData="printData"
+          ></treatPrint>
+          <checkPrint
+            ref="checkPrint"
+            v-if="printType == 3"
+            :printData="printData"
+          ></checkPrint>
         </div>
-
       </el-dialog>
     </div>
   </div>
 </template>
 
 <script>
-  import BreadCrumb from '@/xt_pages/components/bread-crumb'
-  import inquiriesDetail from './components/inquiriesDetail'
-  import { getHisPrescriptionList } from '@/api/his/his'
-  import { uParseTime } from '@/utils/tools'
-  import { getInitData, getBatchPrint } from '@/api/his/his'
-  import print from './batch_print_template/index'
-  import treatPrint from './batch_print_treatTemplate/index'
-  import checkPrint from './batch_print_checkTemplate/index'
-  export default {
-    components: {
-      BreadCrumb,
-      inquiriesDetail,
-      print,
-      treatPrint,
-      checkPrint
-    },
-    data() {
-      return {
-        keywords:"",
-        total:0,
-        record_date:"",
-        page:1,
-        limit:10,
-        crumbs: [
-          { path: false, name: '门诊医生站' },
-          { path: false, name: '既往查询' }
-        ],
-        tableData: [],
-        diagnoses:[],
-        innerVisible: false,
-        selecting_schs:[],
-        printData:[],
-        printType: 0,
-        org_id:'',
-      }
-    },
-    methods: {
-      printThisPage() {
-        if(this.org_id == 10138){
-          const style =
-              '@media print {#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:350px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 88%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:350px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 87%;}}}'
-          printJS({
-            printable: 'printMain',
-            type: 'html',
-            style: style,
-            scanStyles: false
-          })
-        }else{
-          const style =
-              '@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 88%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}.NoCell{display: flex;justify-content: space-between;margin-bottom: 10px;}.underLine{display: inline-block;border-bottom: 1px solid #000;text-align: center;line-height: 24px;}.basicCell{display: flex;} .basicCell span{line-height: 24px;margin-bottom: 10px;}}'
-          printJS({
-            printable: 'printMain',
-            type: 'html',
-            style: style,
-            scanStyles: false
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import inquiriesDetail from "./components/inquiriesDetail";
+import { getHisPrescriptionList } from "@/api/his/his";
+import { uParseTime } from "@/utils/tools";
+import { getInitData, getBatchPrint } from "@/api/his/his";
+import print from "./batch_print_template/index";
+import treatPrint from "./batch_print_treatTemplate/index";
+import checkPrint from "./batch_print_checkTemplate/index";
+export default {
+  components: {
+    BreadCrumb,
+    inquiriesDetail,
+    print,
+    treatPrint,
+    checkPrint,
+  },
+  data() {
+    return {
+      keywords: "",
+      total: 0,
+      record_date: "",
+      page: 1,
+      limit: 10,
+      crumbs: [
+        { path: false, name: "门诊医生站" },
+        { path: false, name: "既往查询" },
+      ],
+      tableData: [],
+      diagnoses: [],
+      innerVisible: false,
+      selecting_schs: [],
+      printData: [],
+      printType: 0,
+      org_id: "",
+    };
+  },
+  methods: {
+    printThisPage(printData) {
+      printData.forEach((item) => {
+        const print = new Promise((resolve, reject) => {
+          if (item.prescriptions.length != 0) {
+            resolve(item.prescriptions);
+          } else {
+            reject(false);
+          }
+        });
+        print
+          .then((printData) => {
+            if (this.org_id == 10138) {
+              const style =
+                "@media print {#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:350px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 88%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:350px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 87%;}}}";
+              printJS({
+                printable: "printMain",
+                type: "html",
+                style: style,
+                scanStyles: false,
+              });
+            }
+            if (this.printType == 3) {
+              const style =
+                "@media print {html {zoom: 80%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}#prescriptionPrint div{box-shadow:none;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 20px;}.infoTitle{display: flex;margin-top:10px;line-height: 24px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}.NoCell{display: flex;justify-content: space-between;margin-bottom: 10px;}.underLine{display: inline-block;border-bottom: 1px solid #000;text-align: center;line-height: 24px;}.basicCell{display: flex;} .basicCell span{line-height: 24px;margin-bottom: 10px;}}";
+              printJS({
+                printable: "printMain",
+                type: "html",
+                style: style,
+                scanStyles: false,
+              });
+            } else {
+              const style =
+                "@media print {html {height: auto;margin: 0px;} #prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 80%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 20px;}.infoTitle{display: flex;margin-top:10px;line-height: 24px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}.NoCell{display: flex;justify-content: space-between;margin-bottom: 10px;}.underLine{display: inline-block;border-bottom: 1px solid #000;text-align: center;line-height: 24px;}.basicCell{display: flex;} .basicCell span{line-height: 24px;margin-bottom: 10px;}}";
+              printJS({
+                printable: "printMain",
+                type: "html",
+                style: style,
+                scanStyles: false,
+              });
+            }
           })
-        }
-        this.innerVisible = false
-        // this.$nextTick(() => {
-        //   this.$refs.print.printThisPage()
-        //   this.$refs.treatPrint.printThisPage()
-        //   this.$refs.checkPrint.printThisPage()
-        // })
-      },
-
-      searchAction(){
-        this.page = 1;
-        this.limit = 10;
-        this.getHisPrescriptionList()
+          .catch((reject) => {});
+      });
 
-      },
-      handleScheduleDateChange(){
-        this.page = 1;
-        this.limit = 10;
-        this.getHisPrescriptionList()
-
-      },
-      handleCurrentChange(page) {
-        this.page = page;
-        this.getHisPrescriptionList()
-
-      },
-
-      handleSizeChange(limit) {
-        this.limit = limit;
-        this.getHisPrescriptionList()
+      this.innerVisible = false;
+      // this.$nextTick(() => {
+      //   this.$refs.print.printThisPage()
+      //   this.$refs.treatPrint.printThisPage()
+      //   this.$refs.checkPrint.printThisPage()
+      // })
+    },
 
+    searchAction() {
+      this.page = 1;
+      this.limit = 10;
+      this.getHisPrescriptionList();
+    },
+    handleScheduleDateChange() {
+      this.page = 1;
+      this.limit = 10;
+      this.getHisPrescriptionList();
+    },
+    handleCurrentChange(page) {
+      this.page = page;
+      this.getHisPrescriptionList();
+    },
 
-      },
-      getTimes(time) {
-        return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");
-      },
-      handerShowDetail(row) {
-        if(row.id == 0){
-          this.$message.error("未就诊")
-          return
+    handleSizeChange(limit) {
+      this.limit = limit;
+      this.getHisPrescriptionList();
+    },
+    getTimes(time) {
+      return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");
+    },
+    handerShowDetail(row) {
+      if (row.id == 0) {
+        this.$message.error("未就诊");
+        return;
+      }
+      this.$refs.inquiriesDetail.show(row.id);
+    },
+    getHisPrescriptionList() {
+      let params = {
+        record_date: this.record_date,
+        page: this.page,
+        limit: this.limit,
+        keywords: this.keywords,
+      };
+      getHisPrescriptionList(params).then((response) => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.tableData = response.data.data.order;
+          this.total = response.data.data.total;
+          this.$nextTick(() => {
+            this.$refs.table.doLayout(); //解决表格错位
+          });
         }
-        this.$refs.inquiriesDetail.show(row.id)
-      }, getHisPrescriptionList() {
-        let params = {
-          record_date:this.record_date,
-          page: this.page,
-          limit: this.limit,
-          keywords: this.keywords,
+      });
+    },
+    getInitData() {
+      getInitData().then((response) => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.diagnoses = response.data.data.diagnose;
+          console.log("诊断列表", this.diagnoses);
         }
-        getHisPrescriptionList(params).then(response => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
-            return false
-          } else {
-            this.tableData = response.data.data.order
-            this.total = response.data.data.total
-            this.$nextTick(() => {
-              this.$refs.table.doLayout(); //解决表格错位
-            });
-          }
-        })
-
-      },
-       getInitData() {
-        getInitData().then(response => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
-            return false
-          } else {
-            this.diagnoses = response.data.data.diagnose
-            console.log("诊断列表",this.diagnoses)
-          }
-        })
-      },
-      getDiagnosis(id){
-        let ids = id.split(",")
-        var name = ""
-        for(let i = 0; i < ids.length; i++){
-
-          for(let b=0;b<this.diagnoses.length;b++){
-            if(parseInt(ids[i]) == this.diagnoses[b].id){
-              if(name.length == 0){
-                name = this.diagnoses[b].class_name
-              }else{
-                name = name +"," + this.diagnoses[b].class_name
-
-              }
+      });
+    },
+    getDiagnosis(id) {
+      let ids = id.split(",");
+      var name = "";
+      for (let i = 0; i < ids.length; i++) {
+        for (let b = 0; b < this.diagnoses.length; b++) {
+          if (parseInt(ids[i]) == this.diagnoses[b].id) {
+            if (name.length == 0) {
+              name = this.diagnoses[b].class_name;
+            } else {
+              name = name + "," + this.diagnoses[b].class_name;
             }
           }
-
-        }
-
-
-
-
-        return name
-      },
-      handleSelectionChange(val) {
-
-        this.selecting_schs = val;
-
-      },
-      batchPrint(type){
-        this.printType = type
-        if (this.selecting_schs.length === 0) {
-          this.$message.error("请至少选择一条需要打印的内容");
-          return false;
         }
-        this.innerVisible = true
+      }
+      return name;
+    },
+    handleSelectionChange(val) {
+      this.selecting_schs = val;
+    },
+    batchPrint(type) {
+      this.printType = type;
+      if (this.selecting_schs.length === 0) {
+        this.$message.error("请至少选择一条需要打印的内容");
+        return false;
+      } else {
         var sch_ids = [];
-
         for (let index = 0; index < this.selecting_schs.length; index++) {
           sch_ids.push(this.selecting_schs[index].patient_id);
         }
-        console.log('sch_ids',sch_ids)
         let params = {
           record_date: this.record_date,
           patient_ids: sch_ids.join(","),
-          type: type
-        }
-        getBatchPrint(params).then(res => {
-          console.log('res',res)
-          let printData = res.data.data.patients
-          this.printData = printData
-        })
+          type: type,
+        };
+        getBatchPrint(params).then((res) => {
+          let Arr = res.data.data.patients;
+          let new_patients = [];
+          if (type != 3) {
+            Arr.forEach((i) => {
+              if (i.prescriptions.length != 0) {
+                new_patients.push(i);
+              }
+            });
+          } else {
+            // 过滤检查单数据出来，筛选出有检查项目的单子，不显示没有检查项目的单子
+            Arr.forEach((el) => {
+              el.prescriptions.forEach((o) => {
+                o.project.forEach((i) => {
+                  if (i.team.project_team != "") {
+                    new_patients.push(el);
+                  }
+                });
+              });
+            });
+            let projectPrint = [];
+            new_patients.forEach((el) => {
+              el.prescriptions.map((item) => {
+                if (item.project.length > 0) {
+                  item.project.map((it) => {
+                    // if (it.type == 2) {
+                    //   if (it.project.cost_classify == 3) {
+                    //     projectPrint.push(it);
+                    //   }
+                    // }
+                    projectPrint.push(it);
+                  });
+                }
+              });
+            });
+            console.log(projectPrint, "projectPrint----去重前");
+            // 数组去重
+            projectPrint = this.split_project(projectPrint);
+            // 配对
+            let data = [];
+            projectPrint.map((item) => {
+              if (item.team.id == 0) {
+                data.push(item);
+              } else {
+                if(item.team.project_team != ""){
+                  new_patients.push(item)
+                }
+              }
+            });
+          }
+
+          this.printData = new_patients;
+        });
       }
-    }, created() {
-      var nowDate = new Date()
-      var nowYear = nowDate.getFullYear()
-      var nowMonth = nowDate.getMonth() + 1
-      var nowDay = nowDate.getDate()
-      this.record_date =
-        nowYear +
-        '-' +
-        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
-        '-' +
-        (nowDay < 10 ? '0' + nowDay : nowDay)
+      this.innerVisible = true;
+    },
 
-      this.org_id = this.$store.getters.xt_user.template_info.org_id
+    split_project(Arr) {
+      let hash = {};
+      Arr = Arr.reduce((preVal, curVal) => {
+        hash[curVal.id] ? "" : (hash[curVal.id] = true && preVal.push(curVal));
+        return preVal;
+      }, []);
+      return Arr;
+    },
+  },
+  created() {
+    var nowDate = new Date();
+    var nowYear = nowDate.getFullYear();
+    var nowMonth = nowDate.getMonth() + 1;
+    var nowDay = nowDate.getDate();
+    this.record_date =
+      nowYear +
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
 
-      this.getHisPrescriptionList()
-      this.getInitData()
+    this.org_id = this.$store.getters.xt_user.template_info.org_id;
 
-    }
-  }
+    this.getHisPrescriptionList();
+    this.getInitData();
+  },
+};
 </script>

src/xt_pages/outpatientDoctorStation/print.vue

@@ -11,9 +11,14 @@
           >打印</el-button
         >
       </template> -->
-
+<!-- 机构id列表
+3877 ：测试
+10138、10243：百霖
+0:本地
+9675:测试
+ -->
     <div class="dialysisPage" style="padding-top: 40px">
-      <div v-if="org_id != 10138 && org_id != 10278 && org_id != 10243 && org_id != 9675">
+      <div v-if="org_id != 10138 && org_id != 10278 && org_id != 10243 && org_id != 4 && org_id !=0">
         <printOne v-if="org_id != 10088 && org_id != 10215" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
 
         <!--        <printSix-->
@@ -55,7 +60,7 @@
 
         <!-- <printSix v-if="org_id != 10088 && org_id != 10215" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printSix> -->
       </div>
-      <div v-else-if="org_id == 10243 || org_id == 9675 || org_id == 0 ">
+      <div v-else-if="org_id == 10243 || org_id == 9675">
         <printSix
           v-bind:childResponse="childResponse"
           :advicePrint="advicePrint"
@@ -248,6 +253,7 @@ export default {
 
   created() {
     this.org_id = this.$store.getters.xt_user.org_id;
+    console.log(this.org_id,'机构id')
     this.getAllDoctorList();
     var record_date = this.paramsObj.record;
     this.record_date = record_date;

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -1,372 +1,525 @@
 <template>
-  <div id='prescriptionPrint'>
-    <div v-for="(item,index) in advicePrint" :key="index">
-      <div id='prescription-print' class="prescription-print" style="page-break-after: always;">
-          <div class="printTitle" v-if="prescriptions[index].med_type == '1111'">{{orgname}}第一类精神处方笺</div>
-          <div class="printTitle"  v-if="prescriptions[index].med_type == '1112'">{{orgname}}第二类精神处方笺</div>
-          <div class="printTitle" v-if="prescriptions[index].med_type != '1111' && prescriptions[index].med_type != '1112'">{{orgname}}处方笺</div>
-          <!--<div class="printTitle">{{orgname}}处方笺</div>-->
-          <div class="infoTitle">
-              <p>姓名：{{item.patient.name?item.patient.name:""}}</p>
-              <p>性别：
-                <span v-if="item.patient.gender == 1">男</span>
-                <span v-if="item.patient.gender == 2">女</span>
-              </p>
-              <p>年龄：{{getAge(item.patient)?getAge(item.patient):""}}岁</p>
+  <div id="prescriptionPrint">
+    <div v-for="(item, index) in advicePrint" :key="index">
+      <div
+        id="prescription-print"
+        class="prescription-print"
+        style="page-break-after: always"
+      >
+        <div class="printTitle" v-if="prescriptions[index].med_type == '1111'">
+          {{ orgname }}第一类精神处方笺
+        </div>
+        <div class="printTitle" v-if="prescriptions[index].med_type == '1112'">
+          {{ orgname }}第二类精神处方笺
+        </div>
+        <div
+          class="printTitle"
+          v-if="
+            prescriptions[index].med_type != '1111' &&
+            prescriptions[index].med_type != '1112'
+          "
+        >
+          {{ orgname }}处方笺
+        </div>
+        <!--<div class="printTitle">{{orgname}}处方笺</div>-->
+        <div class="infoTitle">
+          <p>姓名：{{ item.patient.name ? item.patient.name : "" }}</p>
+          <p>
+            性别：
+            <span v-if="item.patient.gender == 1">男</span>
+            <span v-if="item.patient.gender == 2">女</span>
+          </p>
+          <p>年龄：{{ getAge(item.patient) ? getAge(item.patient) : "" }}岁</p>
+        </div>
+        <div class="infoMain">
+          <div style="margin-bottom: 10px">
+            门诊号：{{ hisPatient.number ? hisPatient.number : "" }}
           </div>
-          <div class="infoMain">
-              <div style="margin-bottom: 10px;">门诊号：{{hisPatient.number?hisPatient.number:""}}</div>
-              <div style="margin-bottom: 10px;">科室：{{item.info?getDepart(item.info.departments):''}}</div>
-              <div style="margin-bottom: 10px;">医保卡号：{{item.hisPatient.number?item.hisPatient.number:""}}</div>
-              <div style="margin-bottom: 10px;" v-if="org_id != 10188">电话：{{item.patient.phone}}</div>
-              <div style="margin-bottom: 10px;" v-else>日期：{{getTime(item.ctime)?getTime(item.ctime):""}}</div>
-              <div>地址：{{item.patient.home_address}}</div>
-              <div style="display:flex;width:50%;">临床诊断：{{getDiagnosis(item.info.diagnosis)}}</div>
+          <div style="margin-bottom: 10px">
+            科室：{{ item.info ? getDepart(item.info.departments) : "" }}
           </div>
-          <div class="prescriptionBox">
-              <div class="Rp">Rp:</div>
-              <div class="drugsBox" v-for="(it,index) in item.advices" :key="index">
-                  <!-- <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div> -->
-                  <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;<span v-if="it.drug.min_unit != it.drug.dose_unit">{{it.drug.dose}}{{it.drug.dose_unit}}&nbsp;* &nbsp;</span>{{it.drug.min_number}}{{it.drug.min_unit}}/{{it.drug.max_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div>
-                  <div style="margin-left:100px;"><span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.execution_frequency}}&nbsp;{{it.delivery_way}}&nbsp;</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
-              </div>
-              <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
-                <div class="drugsOne">{{it.item_name?it.item_name:""}}:&nbsp;{{it.price}}元/{{it.count}}次</div>
-               </div>
-
-              <div class="drugsBox" v-for="(it,index) in item.project" :key="index">
-                  <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.type == 2?getProjectName(it.project_id)?getProjectName(it.project_id):"":it.good_info.good_name}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.count}}{{unit}}</div>
-                  <div style="margin-left:100px;"><span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.delivery_way}}</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
-              </div>
-              <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
-                <div class="drugsOne">{{it.project_id?it.project_id:""}}:&nbsp;{{it.price.toFixed(2)}}元/{{it.count}}次</div>
-               </div>
-               <div style="text-align:center;" >(以下空白)</div>
-
+          <div style="margin-bottom: 10px">
+            医保卡号：{{ item.hisPatient.number ? item.hisPatient.number : "" }}
+          </div>
+          <div style="margin-bottom: 10px" v-if="org_id != 10188">
+            电话：{{ item.patient.phone }}
+          </div>
+          <div style="margin-bottom: 10px" v-else>
+            日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}
           </div>
-          <div class="doctorBox" v-if="org_id != 10188">
-              <p>医师：{{item.doctor?item.doctor:""}}</p>
-              <p>日期：{{getTime(item.ctime)?getTime(item.ctime):""}}</p>
+          <div>地址：{{ item.patient.home_address }}</div>
+          <div style="display: flex; width: 50%">
+            临床诊断：{{ getDiagnosis(item.info.diagnosis) }}
+          </div>
+        </div>
+        <div class="prescriptionBox">
+          <div class="Rp">Rp:</div>
+          <div
+            class="drugsBox"
+            v-for="(it, index) in item.advices"
+            :key="index"
+          >
+            <!-- <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div> -->
+            <div class="drugsOne">
+              <span style="font-weight: bold">{{ index + 1 + "." }}</span
+              >{{ it.advice_name ? it.advice_name : "" }}&nbsp;&nbsp;<span
+                v-if="it.drug.min_unit != it.drug.dose_unit"
+                >{{ it.drug.dose }}{{ it.drug.dose_unit }}&nbsp;* &nbsp;</span
+              >{{ it.drug.min_number }}{{ it.drug.min_unit }}/{{
+                it.drug.max_unit
+              }}&nbsp;×&nbsp; {{ it.prescribing_number
+              }}{{ it.prescribing_number_unit }}
+            </div>
+            <div style="margin-left: 100px">
+              <span>用法：{{ it.single_dose }}{{ it.single_dose_unit }}</span
+              >&nbsp;&nbsp;<span
+                >{{ it.execution_frequency }}&nbsp;{{
+                  it.delivery_way
+                }}&nbsp;</span
+              >&nbsp;&nbsp;<span>{{ it.advice_desc }}</span>
+            </div>
+          </div>
+          <div
+            class="drugsBox"
+            v-for="(it, i) in item.additionalcharge"
+            :key="i"
+          >
+            <div class="drugsOne">
+              {{ it.item_name ? it.item_name : "" }}:&nbsp;{{ it.price }}元/{{
+                it.count
+              }}次
+            </div>
+          </div>
+
+          <div
+            class="drugsBox"
+            v-for="(it, index) in item.project"
+            :key="index"
+          >
+            <div class="drugsOne">
+              <span style="font-weight: bold">{{ index + 1 + "." }}</span
+              >{{
+                it.type == 2
+                  ? getProjectName(it.project_id)
+                    ? getProjectName(it.project_id)
+                    : ""
+                  : it.good_info.good_name
+              }}&nbsp;&nbsp;{{ it.single_dose
+              }}{{ it.single_dose_unit }}&nbsp;×&nbsp; {{ it.count }}{{ unit }}
+            </div>
+            <div style="margin-left: 100px">
+              <span>用法：{{ it.single_dose }}{{ it.single_dose_unit }}</span
+              >&nbsp;&nbsp;<span>{{ it.delivery_way }}</span
+              >&nbsp;&nbsp;<span>{{ it.advice_desc }}</span>
+            </div>
           </div>
-          <div class="doctorBox" v-else>
-            <p>药师：</p>
-            <p>医师：{{item.doctor?item.doctor:""}}</p>
+          <div
+            class="drugsBox"
+            v-for="(it, i) in item.additionalcharge"
+            :key="i"
+          >
+            <div class="drugsOne">
+              {{ it.project_id ? it.project_id : "" }}:&nbsp;{{
+                it.price.toFixed(2)
+              }}元/{{ it.count }}次
+            </div>
           </div>
-          <div class="actionBar" v-if="org_id != 10188">
-                 <!-- <p>审核：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
+          <div style="text-align: center">(以下空白)</div>
+        </div>
+        <div class="doctorBox" v-if="org_id != 10188">
+          <p>
+            医师：
+            <!-- {{ item.doctor ? item.doctor : "" }} -->
+            <span
+              style="width: 100px; display: inline-block"
+              v-if="item.creator == ''"
+            >
+              {{ item.doctor }}
+            </span>
+            <img
+              style="height: 30px"
+              :src="setAdminUserES(item.creator)"
+              alt=""
+              srcset=""
+              v-else
+            />
+          </p>
+          <p>日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}</p>
+        </div>
+        <div class="doctorBox" v-else>
+          <p>药师：</p>
+          <p>医师：{{ item.doctor ? item.doctor : "" }}</p>
+        </div>
+        <div class="actionBar" v-if="org_id != 10188">
+          <!-- <p>审核：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
                  <p>配对：</p>
                  <p>核对：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
                  <p>发药：{{getDoctor(item.advices[0].execution_staff)?getDoctor(item.advices[0].execution_staff):""}}</p>
                  <p>药费：{{getTotalOne(item.id)?getTotalOne(item.id):0}}元</p> -->
 
-                 <p>审核：</p>
-                 <p>配对：</p>
-                 <p>核对：</p>
-                 <p>发药：</p>
-                 <p>药费：{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):0}}元</p>
-<!--            <p>药费：466.2元</p>-->
-
-          </div>
-          <div class="actionBar" v-else>
-            <p style="visibility: hidden;">审核：</p>
-            <p style="visibility: hidden;">配对：</p>
-            <p style="visibility: hidden;">核对：</p>
-            <p style="visibility: hidden;">发药：</p>
-            <p>药费：{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):0}}元</p>
-<!--            <p>药费：551.2元</p>-->
-<!--            <p>药费：466.2元</p>-->
-
-
-          </div>
-          <div style="page-break-after:always"></div>
+          <p>审核：</p>
+          <p>配对：</p>
+          <p>核对：</p>
+          <p>发药：</p>
+          <p>
+            药费：{{
+              getTotalOne(item.id).toFixed(2)
+                ? getTotalOne(item.id).toFixed(2)
+                : 0
+            }}元
+          </p>
+          <!--            <p>药费：466.2元</p>-->
+        </div>
+        <div class="actionBar" v-else>
+          <p style="visibility: hidden">审核：</p>
+          <p style="visibility: hidden">配对：</p>
+          <p style="visibility: hidden">核对：</p>
+          <p style="visibility: hidden">发药：</p>
+          <p>
+            药费：{{
+              getTotalOne(item.id).toFixed(2)
+                ? getTotalOne(item.id).toFixed(2)
+                : 0
+            }}元
+          </p>
+          <!--            <p>药费：551.2元</p>-->
+          <!--            <p>药费：466.2元</p>-->
+        </div>
+        <div style="page-break-after: always"></div>
       </div>
     </div>
-
   </div>
-
-
 </template>
 <script>
-import { jsGetAge, uParseTime } from '@/utils/tools'
-import {getAllDoctorList,getPrescriptionPrint,getHisPatientDetail} from "@/api/project/project"
-import {getInitData} from "@/api/his/his"
+import { jsGetAge, uParseTime } from "@/utils/tools";
+import {
+  getAllDoctorList,
+  getPrescriptionPrint,
+  getHisPatientDetail,
+} from "@/api/project/project";
+import { getInitData } from "@/api/his/his";
 export default {
-    props:{
-      patient_id:Number,
-      record_date:String,
-      prescription_id:Number,
-      ids:String
+  props: {
+    patient_id: Number,
+    record_date: String,
+    prescription_id: Number,
+    ids: String,
+  },
+  data() {
+    return {
+      doctorList: [],
+      advicePrint: {},
+      patient: {},
+      tableData: [],
+      prescriptionInfo: [],
+      hisPatient: {},
+      department: [],
+      prescriptions: [],
+      projectList: [],
+      orgname: "",
+      diagnoses: [],
+      org_id: 0,
+      operatorMaps: {},
+      operators: [],
+      doctorList_1: []
+    };
+  },
+  methods: {
+    // 电子签名
+    setAdminUserES(id) {
+      if (id == 0) {
+        return "";
+      }
+      if (id in this.operatorMaps) {
+        return this.operatorMaps[id].url;
+      } else {
+        return "";
+      }
     },
-    data(){
-      return {
-        doctorList:[],
-        advicePrint:{},
-        patient:{},
-        tableData:[],
-        prescriptionInfo:[],
-        hisPatient:{},
-        department:[],
-        prescriptions:[],
-        projectList:[],
-        orgname:"",
-        diagnoses:[],
-        org_id: 0
+    getAge(patient) {
+      var thisLen = patient.id_card_no.length;
+      var birth = "";
+      if (thisLen == 15) {
+        birth = "19" + patient.id_card_no.substr(6, 6);
+      } else {
+        birth = patient.id_card_no.substr(6, 8);
       }
+      var births =
+        birth.substr(0, 4) +
+        "-" +
+        birth.substr(4, 2) +
+        "-" +
+        birth.substr(6, 2);
+      return jsGetAge(births, "-");
     },
-   methods:{
-     getAge(patient){
-       var thisLen = patient.id_card_no.length
-       var birth = ''
-       if (thisLen == 15) {
-         birth = '19' + patient.id_card_no.substr(6, 6)
-       } else {
-         birth = patient.id_card_no.substr(6, 8)
-       }
-       var births =
-         birth.substr(0, 4) +
-         '-' +
-         birth.substr(4, 2) +
-         '-' +
-         birth.substr(6, 2)
-       return jsGetAge(births, '-')
 
-     },
+    getAllDoctorList() {
+      getAllDoctorList().then((response) => {
+        if (response.data.state == 1) {
+          var doctor = response.data.data.doctor;
 
-     getAllDoctorList(){
-      getAllDoctorList().then(response=>{
-        if(response.data.state == 1){
-               var doctor =  response.data.data.doctor
+          this.doctorList = doctor;
+        }
+      });
+    },
 
-               this.doctorList = doctor
-             }
-         })
-     },
+    getDoctor(id) {
+      var name = "";
+      for (let i = 0; i < this.doctorList.length; i++) {
+        if (id == this.doctorList[i].admin_user_id) {
+          name = this.doctorList[i].user_name;
+        }
+      }
+      return name;
+    },
+    getTime(value, temp) {
+      if (value != undefined) {
+        return uParseTime(value, temp);
+      }
+      return "";
+    },
+    getPrescriptionPrint() {
+      var params = {
+        // patient_id:this.patient_id,
+        // record_date:this.record_date,
+        // prescription_id:this.prescription_id,
+        patient_id: this.patient_id,
+        record_date: this.record_date,
+        prescription_id: this.prescription_id,
+        ids: this.ids,
+        p_type: 2,
+      };
+      console.log("params", params);
+      getPrescriptionPrint(params).then((response) => {
+        if (response.data.state == 1) {
+          var advicePrint = response.data.data.advicePrint;
+          console.log("adviceprint9999", advicePrint);
+          this.advicePrint = advicePrint;
+          this.prescriptions = advicePrint;
 
-      getDoctor(id){
-        var name = ""
-        for(let i=0;i<this.doctorList.length;i++){
-          if(id == this.doctorList[i].admin_user_id){
-              name = this.doctorList[i].user_name
+          this.doctorList_1 = response.data.data.eles;
+          console.log(this.doctorList_1, "医生列表");
+          if (this.doctorList_1.length > 0) {
+            var operatorsLen = this.doctorList_1.length;
+            for (var index = 0; index < operatorsLen; index++) {
+              this.$set(
+                this.operatorMaps,
+                this.doctorList_1[index].creator,
+                this.doctorList_1[index]
+              );
+            }
           }
+
+          console.log("处方222222", this.prescriptions);
+          var hisPatient = response.data.data.hisPatient;
+          console.log("hisPatient", hisPatient);
+          this.hisPatient = hisPatient;
+          var projectlist = response.data.data.projectlist;
+          console.log("所有项目列表", projectlist);
+          this.projectList = projectlist;
+        }
+      });
+    },
+    getHisPatientDetail() {
+      const params = {
+        patient_id: this.patient_id,
+      };
+      getHisPatientDetail(params).then((response) => {
+        if (response.data.state == 1) {
+          var hisPatient = response.data.data.hisPatient;
+          console.log("挂号病人", hisPatient);
+          this.hisPatient = hisPatient;
         }
-        return name
-      },
-      getTime(value, temp) {
-        if (value != undefined) {
-            return uParseTime(value, temp)
+      });
+    },
+    getInitData() {
+      getInitData().then((response) => {
+        if (response.data.state == 1) {
+          this.department = response.data.data.department;
+          this.diagnoses = response.data.data.diagnose;
+          console.log("争端", this.diagnoses);
         }
-        return ''
-     },
-       getPrescriptionPrint(){
-         var params = {
-          // patient_id:this.patient_id,
-          // record_date:this.record_date,
-          // prescription_id:this.prescription_id,
-          patient_id:this.patient_id,
-          record_date:this.record_date,
-          prescription_id:this.prescription_id,
-          ids:this.ids,
-           p_type:2,
-
-         }
-        console.log("params",params)
-       getPrescriptionPrint(params).then(response=>{
-         if(response.data.state == 1){
-            var advicePrint =  response.data.data.advicePrint
-            console.log("adviceprint9999",advicePrint)
-            this.advicePrint = advicePrint
-            this.prescriptions = advicePrint
-            console.log("处方222222",this.prescriptions)
-            var hisPatient = response.data.data.hisPatient
-            console.log("hisPatient",hisPatient)
-            this.hisPatient = hisPatient
-            var projectlist =  response.data.data.projectlist
-            console.log("所有项目列表",projectlist)
-            this.projectList = projectlist
-          }
-       })
-     },
-     getHisPatientDetail(){
-          const params = {
-              patient_id:this.patient_id
-          }
-       getHisPatientDetail(params).then(response=>{
-          if(response.data.state == 1){
-             var hisPatient =  response.data.data.hisPatient
-             console.log("挂号病人",hisPatient)
-             this.hisPatient = hisPatient
-          }
-       })
-     },
-     getInitData(){
-       getInitData().then(response=>{
-          if(response.data.state == 1){
-            this.department = response.data.data.department
-            this.diagnoses = response.data.data.diagnose
-            console.log("争端",this.diagnoses)
-          }
-       })
-     },
-     getDepart(id){
-         var name = ""
-       for(let i=0;i<this.department.length;i++){
-           if(id == this.department[i].id){
-               name = this.department[i].name
-           }
-       }
-       return name
-     },
+      });
+    },
+    getDepart(id) {
+      var name = "";
+      for (let i = 0; i < this.department.length; i++) {
+        if (id == this.department[i].id) {
+          name = this.department[i].name;
+        }
+      }
+      return name;
+    },
     getTotalOne(id) {
-
-        var total = 0
-        var addtotal = 0
-        for (let i = 0; i < this.prescriptions.length; i++) {
-          if(id == this.prescriptions[i].id){
-            if (this.prescriptions[i].project != null) {
-              for (let a = 0; a < this.prescriptions[i].project.length; a++) {
-                total = total + this.prescriptions[i].project[a].price * this.prescriptions[i].project[a].count
-              }
+      var total = 0;
+      var addtotal = 0;
+      for (let i = 0; i < this.prescriptions.length; i++) {
+        if (id == this.prescriptions[i].id) {
+          if (this.prescriptions[i].project != null) {
+            for (let a = 0; a < this.prescriptions[i].project.length; a++) {
+              total =
+                total +
+                this.prescriptions[i].project[a].price *
+                  this.prescriptions[i].project[a].count;
             }
+          }
 
-            if (this.prescriptions[i].additionalcharge != null) {
-              for (let a = 0; a < this.prescriptions[i].additionalcharge.length; a++) {
-                addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
-              }
+          if (this.prescriptions[i].additionalcharge != null) {
+            for (
+              let a = 0;
+              a < this.prescriptions[i].additionalcharge.length;
+              a++
+            ) {
+              addtotal =
+                addtotal +
+                this.prescriptions[i].additionalcharge[a].price *
+                  this.prescriptions[i].additionalcharge[a].count;
             }
-              addtotal =  Math.floor(addtotal * 100) / 100
+          }
+          addtotal = Math.floor(addtotal * 100) / 100;
         }
-
-       }
+      }
 
       for (let i = 0; i < this.prescriptions.length; i++) {
-          if(id == this.prescriptions[i].id){
-            if (this.prescriptions[i].advices != null) {
-              for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
-                total = total + this.prescriptions[i].advices[a].price * this.prescriptions[i].advices[a].prescribing_number
-              }
+        if (id == this.prescriptions[i].id) {
+          if (this.prescriptions[i].advices != null) {
+            for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
+              total =
+                total +
+                this.prescriptions[i].advices[a].price *
+                  this.prescriptions[i].advices[a].prescribing_number;
             }
+          }
 
-            if (this.prescriptions[i].additionalcharge != null) {
-              for (let a = 0; a < this.prescriptions[i].additionalcharge.length; a++) {
-                addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
-              }
+          if (this.prescriptions[i].additionalcharge != null) {
+            for (
+              let a = 0;
+              a < this.prescriptions[i].additionalcharge.length;
+              a++
+            ) {
+              addtotal =
+                addtotal +
+                this.prescriptions[i].additionalcharge[a].price *
+                  this.prescriptions[i].additionalcharge[a].count;
             }
-              addtotal =  Math.floor(addtotal * 100) / 100
+          }
+          addtotal = Math.floor(addtotal * 100) / 100;
         }
-       }
+      }
 
-        return total + addtotal
-      },
+      return total + addtotal;
+    },
 
-     getProjectName(id){
-        var project_name = ""
-        for(let i=0;i<this.projectList.length;i++){
-           if(id == this.projectList[i].id){
-               project_name = this.projectList[i].project_name
-           }
+    getProjectName(id) {
+      var project_name = "";
+      for (let i = 0; i < this.projectList.length; i++) {
+        if (id == this.projectList[i].id) {
+          project_name = this.projectList[i].project_name;
         }
-        return project_name
-     },
-
-     getDiagnosis(id){
-       let arr = id.split(',')
-       var name = ""
-       for(let i=0;i<this.diagnoses.length;i++){
-         if(arr.indexOf(String(this.diagnoses[i].id)) > -1){
-           name += this.diagnoses[i].class_name + ' '
-         }
-       }
-       return name
-     }
+      }
+      return project_name;
+    },
 
-   },
-   created(){
-      this.getAllDoctorList()
-      this.getInitData()
-      this.getPrescriptionPrint()
-      this.getHisPatientDetail()
-      var xtuser = this.$store.getters.xt_user;
-      this.orgname = xtuser.org.org_name;
-      this.org_id = xtuser.org.id
-   },
-   watch:{
-     ids:function(val){
-      this.ids = val
-      this.getPrescriptionPrint()
-    }
-   }
-}
+    getDiagnosis(id) {
+      let arr = id.split(",");
+      var name = "";
+      for (let i = 0; i < this.diagnoses.length; i++) {
+        if (arr.indexOf(String(this.diagnoses[i].id)) > -1) {
+          name += this.diagnoses[i].class_name + " ";
+        }
+      }
+      return name;
+    },
+  },
+  created() {
+    this.getAllDoctorList();
+    this.getInitData();
+    this.getPrescriptionPrint();
+    this.getHisPatientDetail();
+    var xtuser = this.$store.getters.xt_user;
+    this.orgname = xtuser.org.org_name;
+    this.org_id = xtuser.org.id;
+  },
+  watch: {
+    ids: function (val) {
+      this.ids = val;
+      this.getPrescriptionPrint();
+    },
+  },
+};
 </script>
 
 
 <style lang="scss" scoped>
-.prescription-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;
+.prescription-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;
 }
-.printTitle{
-    font-size: 22px;
-    text-align: center;
-    font-weight: bold;
+.printTitle {
+  font-size: 22px;
+  text-align: center;
+  font-weight: bold;
 }
-.infoTitle{
-    display: flex;
-    border-bottom: 2px solid #000;
-    margin-top:10px;
-    line-height: 24px;
-    padding:0 10px;
+.infoTitle {
+  display: flex;
+  border-bottom: 2px solid #000;
+  margin-top: 10px;
+  line-height: 24px;
+  padding: 0 10px;
 }
-.infoTitle p{
-    width: 200px;
+.infoTitle p {
+  width: 200px;
 }
-.infoMain{
-    display: flex;
-    flex-wrap: wrap;
-    border-bottom: 2px solid #000;
-    padding:0 10px;
+.infoMain {
+  display: flex;
+  flex-wrap: wrap;
+  border-bottom: 2px solid #000;
+  padding: 0 10px;
 }
-.infoMain div{
-    width: 50%;
-    line-height: 24px;
+.infoMain div {
+  width: 50%;
+  line-height: 24px;
 }
-.prescriptionBox{
-    padding:0 10px;
-    min-height:450px;
+.prescriptionBox {
+  padding: 0 10px;
+  min-height: 450px;
 }
-.Rp{
-    font-size: 22px;
-    font-weight: bold;
+.Rp {
+  font-size: 22px;
+  font-weight: bold;
 }
-.drugsBox{
-    padding-left: 40px;
-    margin-bottom: 10px;
+.drugsBox {
+  padding-left: 40px;
+  margin-bottom: 10px;
 }
-.drugsBox div{
-    line-height: 20px;
+.drugsBox div {
+  line-height: 20px;
 }
-.drugsOne{
-    line-height: 24px;
+.drugsOne {
+  line-height: 24px;
 }
-.drugsOne span{
-    margin-right: 20px;
+.drugsOne span {
+  margin-right: 20px;
 }
-.doctorBox{
-    display: flex;
-    justify-content: space-between;
-    padding:0 10px;
-    line-height: 24px;
-    border-bottom: 2px solid #000;
+.doctorBox {
+  display: flex;
+  justify-content: space-between;
+  padding: 0 10px;
+  line-height: 24px;
+  border-bottom: 2px solid #000;
 }
-.actionBar{
-    display: flex;
-    justify-content: space-between;
-    line-height: 24px;
-    padding:0 10px;
+.actionBar {
+  display: flex;
+  justify-content: space-between;
+  line-height: 24px;
+  padding: 0 10px;
 }
-.actionBar p{
-    width:150px;
+.actionBar p {
+  width: 150px;
 }
 </style>

src/xt_pages/outpatientDoctorStation/treatPrint.vue

@@ -13,7 +13,9 @@
       </template> -->
             
       <div class='dialysisPage' style="padding-top:40px;">
-        <printOne v-if="org_id != 10138 && org_id != 10278" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
+        <!-- 此下条为本地开发下页面 -->
+        <!-- <printTwo v-if="org_id == 4" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printTwo> -->
+        <printOne v-if="org_id != 10138 && org_id != 10278 && org_id !=4&& org_id !=0" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
         <printTwo v-else v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printTwo>
       </div>
   </div>

src/xt_pages/outpatientTool/components/drugDetail.vue

@@ -0,0 +1,311 @@
+<template>
+    <div>
+        <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
+            <div>
+                <el-input size="small" style="width:150px;" v-model="keywords" 
+                          @keyup.enter.native='searchAction'
+                          placeholder="请输入药品名称"
+                          class="filter-item"/>
+                 <el-button size="small" class="filter-item" type="primary" @click="searchAction">搜索</el-button>
+                <el-date-picker
+                        v-model="chargeDate"
+                        type="daterange"
+                        value-format="yyyy-MM-dd"
+                        range-separator="至"
+                        start-placeholder="开始日期"
+                        @change="changeDate"
+                        end-placeholder="结束日期">
+                </el-date-picker>
+            </div>
+        </div>
+        <el-table :data="tableData" border :row-style="{ color: '#303133' }" ref="table"
+                  :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                  max-height="600"
+                  highlight-current-row>
+
+            <el-table-column align="center" prop="name" label="序号">
+                <template slot-scope="scope">
+                    {{scope.$index + 1}}
+                </template>
+            </el-table-column>
+          
+            <el-table-column align="center" prop="name" label="日期">
+                <template slot-scope="scope">
+                    {{getTime(scope.row.advice_date)}}
+                </template>
+            </el-table-column>
+            <el-table-column align="center" prop="name" label="药品类型">
+                <template slot-scope="scope">
+                    {{getDrugTypeName(scope.row.drug_id)}}
+                </template>
+            </el-table-column>
+            <el-table-column align="center" prop="name" label="药品名称">
+                <template slot-scope="scope">
+                    {{getDrugName(scope.row.drug_id)}}
+                </template>
+            </el-table-column>
+            <el-table-column align="center" prop="name" label="规格">
+                <template slot-scope="scope">
+                  {{getSpecialName(scope.row.drug_id)}}   
+                </template>
+            </el-table-column>
+            <el-table-column align="center" prop="name" label="数量">
+                <template slot-scope="scope">
+                  {{getCount(scope.row.child,scope.row.min_number,scope.row.max_unit,scope.row.min_unit)}}
+                </template>
+            </el-table-column>
+
+            <el-table-column align="center" prop="name" label="单位">
+                <template slot-scope="scope">
+                  {{scope.row.prescribing_number_unit}}
+                </template>
+            </el-table-column>
+
+            <el-table-column align="center" prop="total" label="操作">
+                <template slot-scope="scope">
+                  <div style="color: #589ff8" @click="jump(scope.row.child,scope.row.min_number,scope.row.drug_id)">使用明细</div>
+                </template>
+            </el-table-column>
+
+        </el-table>
+
+       
+       <el-dialog
+        title="药品明细"
+        :visible.sync="dialogVisible"
+        width="60%">
+        <div style="margin-bottom:10px"> <span>药品类型:{{getDrugTypeName(drug_id)}}</span>
+              <span>药品名称:{{getDrugName(drug_id)}}</span>
+        </div>
+        <span>
+            <el-table :data="tableList" border :row-style="{ color: '#303133' }" ref="table"
+                  :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                  max-height="600"
+                  highlight-current-row>
+
+            <el-table-column align="center" prop="name" label="序号">
+                <template slot-scope="scope">
+                    {{scope.$index + 1}}
+                </template>
+            </el-table-column>
+          
+            <el-table-column align="center" prop="name" label="使用日期">
+                <template slot-scope="scope">
+                    {{getTime(scope.row.advice_date)}}
+                </template>
+            </el-table-column>
+            <el-table-column align="center" prop="name" label="患者名字">
+                <template slot-scope="scope">
+                   {{getPatientName(scope.row.patient_id)}}
+                </template>
+            </el-table-column>
+            <el-table-column align="center" prop="name" label="数量">
+                <template slot-scope="scope">
+                    {{scope.row.prescribing_number/min_number}}
+                </template>
+            </el-table-column>
+            <el-table-column align="center" prop="name" label="单位">
+                <template slot-scope="scope">
+                  {{scope.row.prescribing_number_unit}}   
+                </template>
+            </el-table-column>
+        
+        </el-table>
+        </span>
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="dialogVisible = false">取 消</el-button>
+            <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+        </span>
+     </el-dialog>
+
+    </div>
+
+   
+</template>
+
+
+<script>
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import {getDrugDetailSummary} from "@/api/stock"
+  import { uParseTime } from '@/utils/tools'
+import { min } from 'moment'
+  const moment = require('moment')
+  export default {
+    components: {
+      BreadCrumb
+
+    },
+    data() {
+      return {
+        detail_loading: false,
+        tempArr: [],
+        pos: 0,
+        sameRowArr: [],
+        keywords: '',
+        tableData: [],
+        chargeDate: [moment(new Date()).add('year', 0).format('YYYY-MM-DD'), moment(new Date()).add('year', 0).format('YYYY-MM-DD')],
+        limit:10,
+        page:1,
+        total:0,
+       drugList:[],
+       drugTypeList:[],
+       dialogVisible:false,
+       tableList:[],
+       patients:[],
+       min_number:0,
+       drug_type:"",
+       drug_id:0,
+      }
+    },
+    methods:{
+      changeDate(){
+        this.getlist()
+       },
+       getlist(){
+        let start_time = this.chargeDate[0]
+        let end_time = this.chargeDate[1]
+        var params = {
+            start_time: start_time,
+            end_time: end_time,
+            keyword: this.keywords,
+            limit:this.limit,
+            page:this.page,
+        }  
+       
+        getDrugDetailSummary(params).then(response=>{
+          if(response.data.state == 1){
+            var list = response.data.data.list
+           
+            var total = response.data.data.total
+            var drug = response.data.data.drug
+            this.patients = response.data.data.patients
+            for(let i =0;i<list.length;i++){
+               
+              for(let j=0;j<drug.length;j++){
+                if(list[i].drug_id == drug[j].id){
+                  for(let z=0;z<list[i].child.length;z++){
+                    if(list[i].child[z].prescribing_number_unit == drug[j].max_unit){
+                       list[i].child[z].prescribing_number = parseInt(list[i].child[z].prescribing_number) * drug[j].min_number
+                    }
+                  }
+                }
+              }
+            }
+            this.drugList = drug
+            this.total = total
+            this.drugTypeList = response.data.data.drugTypeList
+            for(let i=0;i<list.length;i++){
+                list[i].min_number = 0
+                list[i].max_unit = ""
+                list[i].min_unit = ""
+             for(let j=0;j<drug.length;j++){
+               if(list[i].drug_id == drug[j].id){
+                 list[i].min_number = drug[j].min_number
+                 list[i].max_unit = drug[j].max_unit
+                 list[i].min_unit = drug[j].min_unit
+                 this.tableData.push(list[i])
+               }
+             }
+            }
+           
+          }
+        })  
+      },
+     getTime(val) {
+         if(val < 0){
+           return ""
+         }
+         if(val == ""){
+          return ""
+         }else {
+          return uParseTime(val, '{y}-{m}-{d}')
+         }
+      },  
+     getDrugName(id){
+       var drug_name = ""
+       for(let i=0;i<this.drugList.length;i++){
+        if(id == this.drugList[i].id){
+           drug_name = this.drugList[i].drug_name
+        }
+       } 
+       return drug_name 
+     },
+     getSpecialName(id){
+       var specification_name = ""
+        for(let i=0;i<this.drugList.length;i++){
+        if(id == this.drugList[i].id){
+           specification_name = this.drugList[i].dose + this.drugList[i].dose_unit +"*" + this.drugList[i].min_number +this.drugList[i].min_unit +"/" + this.drugList[i].max_unit;
+        }
+       } 
+       return specification_name    
+     },
+     searchAction(){
+       this.getlist()  
+     },
+     getDrugTypeName(drug_id){
+      
+       var drug_type = ""
+       for(let i=0;i<this.drugList.length;i++){
+         if(drug_id == this.drugList[i].id){
+            drug_type = this.drugList[i].drug_type
+         }
+       }
+       var type_name = ""
+       for(let i=0;i<this.drugTypeList.length;i++ ){
+          if(drug_type == this.drugTypeList[i].value){
+            type_name = this.drugTypeList[i].name
+          }
+       }  
+       return type_name
+     },
+     getCount(val,min_number,max_unit,min_unit){
+   
+       var total = 0
+       var min_str = ""
+       var max_str = ""
+       if(val.length > 0){
+         for(let i=0;i<val.length;i++){
+           total += parseInt(val[i].prescribing_number)
+         }
+       }
+    
+        if (total < min_number){
+          min_str = total + min_unit
+        }
+        if (total == 0) {
+          min_str = ""
+          max_str = ""
+        }
+        if (total >=min_number) {
+           if(parseInt(total/min_number)!=0){
+              max_str = parseInt(total/min_number) + max_unit
+           }
+           if(total%min_number!=0){
+              min_str = total%min_number + min_unit
+           }
+
+        }
+        return max_str + min_str
+       },
+       jump(val,min_number,drug_id){
+         this.dialogVisible = true
+         this.tableList= val
+         this.min_number = min_number
+         this.drug_id = drug_id
+       },
+       getPatientName(id){
+         var name = ""
+         for(let i=0;i<this.patients.length;i++){
+            if(id == this.patients[i].id){
+              name = this.patients[i].name
+            }
+         }
+         return name
+       }
+     
+    },
+    created() {
+      this.getlist()
+    }
+  }
+</script>

src/xt_pages/outpatientTool/components/goodDetail.vue

@@ -0,0 +1,266 @@
+<template>
+    <div>
+        <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
+            <div>
+                <el-input size="small" style="width:150px;" v-model="keywords" 
+                          @keyup.enter.native='searchAction'
+                          placeholder="请输入耗材名称"
+                          class="filter-item"/>
+                 <el-button size="small" class="filter-item" type="primary" @click="searchAction">搜索</el-button>
+                <el-date-picker
+                        v-model="chargeDate"
+                        type="daterange"
+                        value-format="yyyy-MM-dd"
+                        range-separator="至"
+                        start-placeholder="开始日期"
+                        @change="changeDate"
+                        end-placeholder="结束日期">
+                </el-date-picker>
+            </div>
+        </div>
+        <el-table :data="tableData" border :row-style="{ color: '#303133' }" ref="table"
+                  :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                  max-height="600"
+                  highlight-current-row>
+
+            <el-table-column align="center" prop="name" label="序号">
+                <template slot-scope="scope">
+                    {{scope.$index +1}}
+                </template>
+            </el-table-column>
+          
+            <el-table-column align="center" prop="name" label="日期">
+                <template slot-scope="scope">
+                {{getTime(scope.row.record_date)}}
+                </template>
+            </el-table-column>
+            <el-table-column align="center" prop="name" label="耗材类型">
+                <template slot-scope="scope">
+                 {{getGoodType(scope.row.project_id)}}
+                </template>
+            </el-table-column>
+            <el-table-column align="center" prop="name" label="耗材名称">
+                <template slot-scope="scope">
+                  {{getGoodName(scope.row.project_id)}}
+                </template>
+            </el-table-column>
+            <el-table-column align="center" prop="name" label="规格">
+                <template slot-scope="scope">
+                    {{getSpecificatioName(scope.row.project_id)}}
+                </template>
+            </el-table-column>
+            <el-table-column align="center" prop="name" label="数量">
+                <template slot-scope="scope">
+                  {{getCount(scope.row.child)}}
+                </template>
+            </el-table-column>
+
+            <el-table-column align="center" prop="name" label="单位">
+                <template slot-scope="scope">
+                   {{getUnit(scope.row.project_id)}}
+                </template>
+            </el-table-column>
+
+            <el-table-column align="center" prop="total" label="操作">
+                <template slot-scope="scope">
+                   <div style="color: #589ff8" @click="jump(scope.row.child,scope.row.project_id)">使用明细</div>
+                </template>
+            </el-table-column>
+
+        </el-table>
+
+
+             
+       <el-dialog
+        title="耗材明细"
+        :visible.sync="dialogVisible"
+        width="60%">
+        <div style="margin-bottom:10px"> <span>耗材类型:{{getGoodType(good_id)}}</span>
+              <span>耗材名称:{{getGoodName(good_id)}}</span>
+        </div>
+        <span>
+            <el-table :data="tableList" border :row-style="{ color: '#303133' }" ref="table"
+                  :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                  max-height="600"
+                  highlight-current-row>
+
+            <el-table-column align="center" prop="name" label="序号">
+                <template slot-scope="scope">
+                    {{scope.$index + 1}}
+                </template>
+            </el-table-column>
+          
+            <el-table-column align="center" prop="name" label="使用日期">
+                <template slot-scope="scope">
+                    {{getTime(scope.row.record_date)}}
+                </template>
+            </el-table-column>
+            <el-table-column align="center" prop="name" label="患者名字">
+                <template slot-scope="scope">
+                   {{getPatientName(scope.row.patient_id)}}
+                </template>
+            </el-table-column>
+            <el-table-column align="center" prop="name" label="数量">
+                <template slot-scope="scope">
+                   {{scope.row.count}}
+                </template>
+            </el-table-column>
+            <el-table-column align="center" prop="name" label="单位">
+                <template slot-scope="scope">
+                  {{getUnit(scope.row.project_id)}}   
+                </template>
+            </el-table-column>
+        
+        </el-table>
+        </span>
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="dialogVisible = false">取 消</el-button>
+            <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+        </span>
+     </el-dialog>
+    </div>
+
+</template>
+
+
+<script>
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  const moment = require('moment')
+import {getGoodDetailSummary} from "@/api/stock"
+  import { uParseTime } from '@/utils/tools'
+  export default {
+    components: {
+      BreadCrumb
+
+    },
+    data() {
+      return {
+        detail_loading: false,
+        tempArr: [],
+        pos: 0,
+        sameRowArr: [],
+        keywords: '',
+        tableData: [],
+        chargeDate: [moment(new Date()).add('year', 0).format('YYYY-MM-DD'), moment(new Date()).add('year', 0).format('YYYY-MM-DD')],
+        limit:10,
+        page:1,
+        total:0,
+        goodList:[],
+        patients:[],
+        good_id:0,
+        goodType:[],
+        dialogVisible:false,
+        tableList:[],
+      }
+    },
+    methods:{
+     changeDate(){
+         
+     },
+     getlist(){
+       let start_time = this.chargeDate[0]
+        let end_time = this.chargeDate[1]
+        var params = {
+            start_time: start_time,
+            end_time: end_time,
+            keyword: this.keywords,
+            limit:this.limit,
+            page:this.page,
+        }  
+       getGoodDetailSummary(params).then(response=>{
+         if(response.data.state == 1){
+           var list = response.data.data.list
+         
+           this.total = response.data.data.total
+           this.goodList = response.data.data.good
+           this.goodType = response.data.data.goodType
+           for(let i=0;i<list.length;i++){
+            for(let j=0;j<this.goodList.length;j++){
+              if(list[i].project_id == this.goodList[j].id){
+                 this.tableData.push(list[i])
+              }
+            }
+           }
+           this.patients = response.data.data.patients
+         }
+       })   
+     },
+     jump(val,good_id){
+         this.dialogVisible = true
+         this.tableList= val
+         this.good_id = good_id
+       },
+       getPatientName(id){
+         var name = ""
+         for(let i=0;i<this.patients.length;i++){
+            if(id == this.patients[i].id){
+              name = this.patients[i].name
+            }
+         }
+         return name
+       },
+       getTime(val) {
+         if(val < 0){
+           return ""
+         }
+         if(val == ""){
+          return ""
+         }else {
+          return uParseTime(val, '{y}-{m}-{d}')
+         }
+      },  
+      getGoodType(id){
+       var good_type = 0
+       for(let i=0;i<this.goodList.length;i++){
+         if(id == this.goodList[i].id){
+           good_type = this.goodList[i].good_type_id
+         }
+       }
+       var type_name = ""
+       for(let i=0;i<this.goodType.length;i++){
+         if(good_type == this.goodType[i].id){
+           type_name = this.goodType[i].type_name
+         }
+       }
+       return type_name
+      },
+      getGoodName(good_id){
+        var good_name = ""
+        for(let i=0;i<this.goodList.length;i++){
+          if(good_id == this.goodList[i].id){
+             good_name = this.goodList[i].good_name
+          }
+        }
+        return good_name
+      },
+      getSpecificatioName(good_id){
+        var specification_name = ""
+        for(let i=0;i<this.goodList.length;i++){
+          if(good_id == this.goodList[i].id){
+             specification_name = this.goodList[i].specification_name
+          }
+        }
+        return specification_name
+      },
+      getCount(val){
+        var total = 0
+        for(let i=0;i<val.length;i++){
+           total +=val[i].count
+        }
+        return total
+      },
+      getUnit(id){
+        var packing_unit = ""
+        for(let i=0;i<this.goodList.length;i++){
+          if(id == this.goodList[i].id){
+            packing_unit = this.goodList[i].packing_unit
+          }
+        }
+        return packing_unit
+      }
+    },
+    created() {
+      this.getlist()
+    }
+  }
+</script>

src/xt_pages/outpatientTool/zeroSummary.vue

@@ -0,0 +1,307 @@
+<template>
+    <div class="main-contain new-main-contain">
+        <div class="position">
+            <bread-crumb :crumbs='crumbs'></bread-crumb>
+        </div>
+        <div class="app-container" style="display:flex;flex: 1;padding: 10px 20px 0px 20px;">
+
+            <div class="mainRight">
+                <el-tabs v-model="titleType">
+                    <el-tab-pane label="药品零用" name="药品零用"></el-tab-pane>
+                    <el-tab-pane label="耗材零用" name="耗材零用"></el-tab-pane>
+                </el-tabs>
+                <drugDetail v-if="titleType == '药品零用'"></drugDetail>
+                <goodDetail v-if="titleType == '耗材零用'"></goodDetail>
+               
+               
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import goodDetail from './components/goodDetail'
+  import drugDetail from './components/drugDetail'
+
+
+  const moment = require('moment')
+
+  export default {
+    components: {
+      goodDetail,
+      drugDetail,
+      BreadCrumb
+
+    },
+    data() {
+      return {
+        titleType: '药品零用',
+        crumbs: [
+        { path: false, name: "零用明细汇总" },
+        { path: false, name: "药品零用" }
+      ],
+      }
+    },
+    methods: {
+    
+    },
+    created() {
+     
+    },
+
+    mounted() {
+
+    },
+    watch: {}
+  }
+</script>
+
+<style lang="scss" scoped>
+    .new-main-contain {
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+    }
+
+    .app-container {
+        height: 100%;
+    }
+
+    .mainCell {
+        height: 36px;
+        display: flex;
+        align-items: center;
+    }
+
+    .mainLeft {
+        width: 200px;
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+
+    .el-radio {
+        margin-right: 5px;
+    }
+
+    }
+    .mainRight {
+        margin-left: 10px;
+        flex: 1;
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+        overflow-y: auto;
+
+    .cellSpan {
+        min-width: 80px;
+        display: inline-block;
+        margin-right: 10px;
+    }
+
+    }
+    .mainCenter {
+        display: flex;
+        flex: 1;
+    }
+
+    .centerLeft {
+        flex: 1;
+        display: flex;
+        flex-direction: column;
+        position: relative;
+
+    .el-form-item {
+        width: 32%;
+        margin-right: 1%;
+        float: left;
+    }
+
+    .el-form-item__label {
+        text-align: left;
+    }
+
+    }
+    .backColor {
+        background: #f6f8f9;
+        height: 5px;
+        margin-bottom: 5px;
+    }
+
+    .tabsBox {
+        position: relative;
+        height: 76%;
+        overflow-y: auto;
+        margin-bottom: 60px;
+
+    .el-tabs__item {
+        padding: 0 10px;
+    }
+
+    }
+    .preTabs {
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+
+    .el-tabs__content {
+        flex: 1;
+        overflow-y: auto;
+    }
+
+    }
+
+    .costBox {
+        width: 100%;
+        height: 60px;
+        background: #fff;
+        position: absolute;
+        bottom: 0;
+        display: flex;
+        align-items: center;
+    }
+
+    .addTab {
+        position: absolute;
+        right: 0;
+        top: 14px;
+        z-index: 20;
+    }
+
+    .centerRight {
+        width: 300px;
+        margin-left: 10px;
+        display: flex;
+        flex-direction: column;
+        position: relative;
+    }
+
+    .rightTab {
+        height: 40px;
+        width: 100%;
+        border: 1px solid #d2d2d2;
+        box-sizing: border-box;
+
+    p {
+        width: 50%;
+        height: 40px;
+        line-height: 40px;
+        text-align: center;
+        background: #eee;
+        float: left;
+    }
+
+    > p:last-child {
+        border-left: 1px solid #d2d2d2;
+        float: right;
+    }
+
+    .activeP {
+        background: #409EFF;
+        color: #fff;
+    }
+
+    }
+    .comfirmBox {
+        width: 100%;
+        height: 60px;
+        background: #fff;
+        position: absolute;
+        bottom: 0;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+    }
+
+    .mainHeader {
+        width: 100%;
+        background: #fff;
+        position: fixed;
+        z-index: 100;
+        height: 36px;
+    }
+
+    .titleBox {
+        position: fixed;
+        z-index: 99;
+        background: #fff;
+    }
+
+    .fixedCell {
+        position: fixed;
+        z-index: 99;
+        right: 30px;
+        background: #fff;
+        width: 300px;
+        display: flex;
+        justify-content: space-between;
+    }
+</style>
+
+<style lang="scss">
+    .centerLeft {
+
+    .el-form-item__label {
+        text-align: left;
+    }
+
+    }
+    .tabsBox {
+
+    .el-tabs__item {
+        padding: 0 10px;
+    }
+
+    .el-tabs--bottom .el-tabs--left > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--bottom .el-tabs--right > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--bottom.el-tabs--border-card > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--bottom.el-tabs--card > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--top .el-tabs--left > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--top .el-tabs--right > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--top.el-tabs--border-card > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--top.el-tabs--card > .el-tabs__header .el-tabs__item:nth-child(2) {
+        padding: 0 10px;
+    }
+
+    .el-tabs--bottom .el-tabs--left > .el-tabs__header .el-tabs__item:last-child, .el-tabs--bottom .el-tabs--right > .el-tabs__header .el-tabs__item:last-child, .el-tabs--bottom.el-tabs--border-card > .el-tabs__header .el-tabs__item:last-child, .el-tabs--bottom.el-tabs--card > .el-tabs__header .el-tabs__item:last-child, .el-tabs--top .el-tabs--left > .el-tabs__header .el-tabs__item:last-child, .el-tabs--top .el-tabs--right > .el-tabs__header .el-tabs__item:last-child, .el-tabs--top.el-tabs--border-card > .el-tabs__header .el-tabs__item:last-child, .el-tabs--top.el-tabs--card > .el-tabs__header .el-tabs__item:last-child {
+        padding: 0 10px;
+    }
+
+    .el-tabs--card > .el-tabs__header .el-tabs__item.is-active.is-closable {
+        padding: 0 10px;
+    }
+
+    }
+    .centerRight {
+
+    .el-tabs__nav-scroll {
+        display: flex;
+    }
+
+    .el-tabs__nav {
+        margin: 0 auto;
+    }
+
+    .el-table th .cell, .el-table td .cell {
+        padding: 0 2px;
+    }
+
+    }
+    .preTabs {
+
+    .el-tabs__content {
+
+    }
+
+    }
+    .rightTabs {
+        height: 100%;
+
+
+    .el-tabs__content {
+
+    }
+
+    }
+    .centerDialog {
+
+    .el-dialog__body {
+        max-height: calc(100vh - 100px) !important;
+        padding: 0 20px;
+    }
+
+    }
+</style>

src/xt_pages/stock/detail/print.vue

@@ -51,8 +51,9 @@
               <td style="line-height: 50px">
                 <span v-if="type == 1"> {{ item.warehousing_count }}</span>
                 <span v-if="type == 2"> 
-                  <span  v-if= "org_id == 3907 || org_id == 9919 || org_id == 9583">{{getStockCount(item.good_id) }}</span>  
-                  <span v-else>{{getStockCount(item.good_id) }}</span>
+                  <span  v-if="org_id == 3907 || org_id == 9919 || org_id == 9583">{{getStockCount(item.good_id) }}</span> 
+                   <span  v-if="org_id == 10265">{{getMySelfCount(item.good_id) }}</span>   
+                  <span v-if="org_id!=3907&&org_id!=10265&&org_id!=10285&&org_id!=9583">{{getStockCount(item.good_id) }}</span>
                 </span>
                
                 <span v-if="type == 4"> {{ item.count }}</span>
@@ -63,7 +64,7 @@
               <td style="line-height:50px">
                 <span v-if="type == 1"> {{ item.price }}</span>
                 <span v-if="type == 2"> 
-                  <span v-if="org_id == 9919 || org_id == 9671">{{ item.buy_price }}</span>  
+                  <span v-if="org_id == 9919">{{ item.buy_price }}</span>  
                   <span v-else>
                     {{ item.packing_price }} 
                   </span>  
@@ -73,10 +74,11 @@
               <td style="line-height:50px">
                 <span v-if="type == 1">{{(item.warehousing_count * item.price).toFixed(2)}}</span>
                 <span v-if="type == 2">
-                  <span v-if="org_id == 3907 || org_id ==9919 || org_id == 9671">
-                     {{(getStockCount(item.good_id) * item.buy_price).toFixed(2) }}
+                  <span v-if="org_id == 3907 || org_id ==9919">
+                     {{(getStockCount(item.good_id) * item.buy_price).toFixed(2)}}
                   </span>
-                  <span v-else>{{(getStockCount(item.good_id) * item.packing_price).toFixed(2)}}</span>
+                  <span v-if="org_id == 10265">{{(getMySelfCount(item.good_id)*item.packing_price).toFixed(2)}}</span>
+                  <span v-if="org_id!=3907&&org_id!=10265&&org_id!=9919">{{(getStockCount(item.good_id) * item.packing_price).toFixed(2)}}</span>
                 </span>
                 <span v-if="type == 4">{{(item.count * item.price).toFixed(2)}}</span>
               </td>
@@ -97,8 +99,9 @@
               <td style="line-height: 50px"  width="80">
                 <span v-if="type == 1">{{getWareInfoTotal().toFixed(2)}}</span> 
                 <span v-if="type == 2">
-                  <span v-if="org_id == 3907 || org_id == 9919 || org_id == 9671">{{getWareOutTotalOne().toFixed(2)}}</span>
-                  <span v-else> {{getWareOutTotal().toFixed(2)}}</span>
+                  <span v-if="org_id == 3907 || org_id == 9919">{{getWareOutTotalOne().toFixed(2)}}</span>
+                  <span v-if="org_id == 10265">{{getWareOutTotalSix().toFixed(2)}}</span>
+                  <span v-if="org_id!=3907 && org_id!=9919 && org_id!=10265"> {{getWareOutTotal().toFixed(2)}}</span>
                  </span> 
                 <span v-if="type == 4">{{getWareOutTotal().toFixed(2)}}</span> 
               </td>
@@ -406,13 +409,28 @@
        return total
      },
      getWareOutTotalOne(){
-       console.log("数据23332323",this.stockDatas)
        var total = 0
        for(let i=0;i<this.stockDatas.length;i++){
          total+= this.getStockCount(this.stockDatas[i].good_id) * this.stockDatas[i].buy_price
        }
        return total
-     }
+     },
+     getMySelfCount(good_id){
+       var total = 0
+       for(let i=0;i<this.stockDatas.length;i++){
+         if(good_id == this.stockDatas[i].good_id){
+            total+= this.stockDatas[i].count
+         }
+       }
+       return total
+     },
+     getWareOutTotalSix(){
+       var total = 0
+       for(let i=0;i<this.stockDatas.length;i++){
+         total+= this.getMySelfCount(this.stockDatas[i].good_id) * this.stockDatas[i].packing_price
+       }
+       return total
+     },
     },
     created() {
       var xtuser = this.$store.getters.xt_user

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -754,10 +754,18 @@ export default {
         if(this.orgId == 9919){
           this.tableOut[i].total_price = (this.tableOut[i].count * this.tableOut[i].buy_price).toFixed(2)
           this.tableOut[i].packing_price = this.tableOut[i].buy_price
+        }else if(this.orgId == 10265){
+          this.tableOut[i].total_price = (this.getMySelfCount(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
         }else{
           this.tableOut[i].total_price = (this.getStockCount(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
         }
-        this.tableOut[i].out_count = this.getStockCount(this.tableOut[i].good_id)
+       
+        if(this.orgId  == 10265){
+        
+         this.tableOut[i].out_count = this.getMySelfCount(this.tableOut[i].good_id)
+        }else{
+          this.tableOut[i].out_count = this.getStockCount(this.tableOut[i].good_id)
+        }
        }
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','出货价','总价','备注']
@@ -845,7 +853,7 @@ export default {
       getGoodDetailPrintList(params).then(response=>{
         if(response.data.state == 1){
           var list = response.data.data.list
-        
+          console.log("lisrt23323223233232232323232323",list)
           this.tableOut = list
           var stockTotal = response.data.data.stockTotal
           console.log("list88888888888888888888",stockTotal)
@@ -863,6 +871,22 @@ export default {
         }
         return count
     }, 
+    getMySelfCount(good_id){
+       var total = 0
+       for(let i=0;i<this.tableOut.length;i++){
+         if(good_id == this.tableOut[i].good_id){
+            total+= this.tableOut[i].count
+         }
+       }
+       return total
+     },
+     getWareOutTotalSix(){
+       var total = 0
+       for(let i=0;i<this.tableOut.length;i++){
+         total+= this.getMySelfCount(this.tableOut[i].good_id) * this.tableOut[i].packing_price
+       }
+       return total
+     },
   }
 };
 </script>

src/xt_pages/stock/inventoryTransfer/Addtrans.vue

@@ -0,0 +1,226 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+      <div>
+        <el-button type="primary" @click="save">保存</el-button>
+        <el-button type="warning" @click="examine">审核</el-button>
+      </div>
+    </div>
+    <div class="app-container">
+      <div
+        style="
+          justify-content: flex-start;
+          margin: 0px 0 12px 0;
+          display: flex;
+          align-items: center;
+        "
+      >
+        <el-form
+          :inline="true"
+          :rules="rules"
+          :model="formInline"
+          class="demo-form-inline"
+        >
+          <el-form-item label="单据日期：">
+            <el-date-picker
+              v-model="value1"
+              type="date"
+              placeholder="选择日期"
+            ></el-date-picker>
+          </el-form-item>
+          <el-form-item label="调出仓库：" prop="region">
+            <el-select v-model="formInline.region" placeholder="活动区域">
+              <el-option label="区域一" value="shanghai"></el-option>
+              <el-option label="区域二" value="beijing"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="调入仓库：" prop="region">
+            <el-select v-model="formInline.region" placeholder="活动区域">
+              <el-option label="区域一" value="shanghai"></el-option>
+              <el-option label="区域二" value="beijing"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-form>
+      </div>
+      <el-table
+        :row-style="changColor"
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266',
+        }"
+        :data="tableData"
+        :class="signAndWeighBoxPatients"
+        border
+      >
+        >
+        <el-table-column label="单据编号" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.drug_name ? scope.row.drug_name : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center">
+          <template slot="header" slot-scope="scope">
+            商品名称<span style="color:red;">*</span>
+          </template>
+          <template slot-scope="scope">
+        <span>{{ scope.row.Count ? scope.row.Count : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="商品类型" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.Count ? scope.row.Count : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="规格&&单位" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.outCount ? scope.row.outCount : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="调拨数量" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.outCount ? scope.row.outCount : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="库存总数" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.outCount ? scope.row.outCount : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="制单人" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.outCount ? scope.row.outCount : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.outCount ? scope.row.outCount : "" }}</span>
+          </template>
+        </el-table-column>
+
+
+
+        <el-table-column label="操作" align="center" width="260px">
+          <template slot-scope="scope">
+            <el-tooltip class="item" content="新增" placement="top-start">
+              <el-button
+                icon="el-icon-plus"
+                size="small"
+                type="primary"
+                @click="toAdd(scope.row)"
+              >
+              </el-button>
+            </el-tooltip>
+
+            <el-tooltip class="item" content="删除" placement="top-start">
+              <el-button
+                icon="el-icon-delete"
+                size="small"
+                type="danger"
+                @click="toDelete(scope.row, scope.row.$index)"
+              >
+              </el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[10, 50, 100, 200, 500, 1000]"
+        :page-size="10"
+        background
+        align="right"
+        style="margin-top: 20px"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      >
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
+export default {
+  components: {
+    BreadCrumb,
+  },
+  data() {
+    return {
+      crumbs: [
+        { path: false, name: "库房管理" },
+        { path: "/stock/warehousequery", name: "新增调拨" },
+      ],
+      value1: "",
+      total: 0,
+      page: 1,
+      limit: 10,
+      tableData: [{}, {}],
+      formInline: {
+        user: "",
+        region: "",
+      },
+      rules: {
+        region: [
+          { required: true, message: "请选择活动区域", trigger: "change" },
+        ],
+      },
+    };
+  },
+
+  methods: {
+    // 初始化数据
+    init() {},
+
+    // 反审核
+    approval() {},
+
+    // 审核
+    examine() {},
+
+    // 保存
+    save() {},
+
+    // 表单添加
+    toAdd() {},
+
+    // 删除
+    toDelete() {},
+
+    // 详情查看
+    toDetails() {},
+
+    // 表单全选
+    handleSelectionChange() {},
+
+    // 页表操作
+    handleSizeChange(val) {
+      this.limit = val;
+      this.init();
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.init();
+    },
+
+    // 表格样式
+    changColor({ rowIndex }) {
+      if (rowIndex % 2 == 1) {
+        return {
+          backgroundColor: "#C4E1FF",
+          color: "#303133",
+        };
+      } else {
+        return {
+          backgroundColor: "#ACD6FF",
+          color: "#303133",
+        };
+      }
+    },
+  },
+};
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+</style>

src/xt_pages/stock/inventoryTransfer/index.vue

@@ -0,0 +1,228 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+      <div>
+        <el-button type="warning" @click="approval">反审核</el-button>
+        <el-button type="warning" @click="examine">审核</el-button>
+        <el-button type="primary" @click="Add">新增</el-button>
+      </div>
+    </div>
+    <div class="app-container">
+      <div
+        style="
+          justify-content: flex-start;
+          margin: 0px 0 12px 0;
+          display: flex;
+          align-items: center;
+        "
+      >
+        <div>
+          <el-input
+            size="small"
+            style="width: 200px; margin-left: 10px"
+            class="filter-item"
+            v-model.trim="keywords"
+          />
+          <el-button
+            size="small"
+            class="filter-item"
+            type="primary"
+            icon="el-icon-search"
+            @click="search"
+            >查看</el-button
+          >
+        </div>
+        <div>
+          单据日期：
+          <el-date-picker v-model="value1" type="date" placeholder="选择日期">
+          </el-date-picker>
+          <el-button
+            size="small"
+            class="filter-item"
+            type="primary"
+            icon="el-icon-search"
+            @click="search"
+            >查看</el-button
+          >
+        </div>
+      </div>
+      <el-table
+        :row-style="changColor"
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266',
+        }"
+        :data="tableData"
+        :class="signAndWeighBoxPatients"
+        border
+        @selection-change="handleSelectionChange"
+      >
+        >
+        <el-table-column type="selection" width="55"> </el-table-column>
+        <el-table-column label="单据编号" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.drug_name ? scope.row.drug_name : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="单据日期" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.drug_spec ? scope.row.drug_spec : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="商品名称" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.Count ? scope.row.Count : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="调出仓库" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.Count ? scope.row.Count : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="调入仓库" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.outCount ? scope.row.outCount : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="制单人" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.outCount ? scope.row.outCount : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="审核人" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.outCount ? scope.row.outCount : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="审核时间" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.outCount ? scope.row.outCount : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="260px">
+          <template slot-scope="scope">
+            <el-tooltip class="item" content="编辑" placement="top-start">
+              <el-button
+                icon="el-icon-edit-outline"
+                size="small"
+                type="primary"
+                @click="toEdit(scope.row)"
+              >
+              </el-button>
+            </el-tooltip>
+
+            <el-tooltip class="item" content="删除" placement="top-start">
+              <el-button
+                icon="el-icon-delete"
+                size="small"
+                type="danger"
+                @click="toDelete(scope.row, scope.row.$index)"
+              >
+              </el-button>
+            </el-tooltip>
+
+            <el-tooltip class="item" content="详情" placement="top-start">
+              <el-button
+                icon="el-icon-view"
+                size="small"
+                type="primary"
+                @click="toDetails(scope.row, scope.row.$index)"
+              >
+              </el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[10, 50, 100, 200, 500, 1000]"
+        :page-size="10"
+        background
+        align="right"
+        style="margin-top: 20px"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      >
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
+export default {
+  components: {
+    BreadCrumb,
+  },
+  data() {
+    return {
+      crumbs: [
+        { path: false, name: "库房管理" },
+        { path: "/stock/warehousequery", name: "库存调拨" },
+      ],
+      value1: "",
+      total: 0,
+      page: 1,
+      limit: 10,
+      tableData: [{}, {}],
+    };
+  },
+
+  methods: {
+    // 初始化数据
+    init() {},
+
+    // 反审核
+    approval() {},
+
+    // 审核
+    examine() {},
+
+    // 添加
+    Add() {
+        this.$router.push({path:"/stock/inventoryTransfer/Addtrans"})
+    },
+
+    // 删除
+    toDelete() {},
+
+    // 详情查看
+    toDetails() {
+        this.$router.push({path:"/stock/inventoryTransfer/transDetails"})
+    },
+
+    // 表单全选
+    handleSelectionChange() {},
+
+    // 页表操作
+    handleSizeChange(val) {
+      this.limit = val;
+      this.init();
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.init();
+    },
+
+    // 表格样式
+    changColor({ rowIndex }) {
+      if (rowIndex % 2 == 1) {
+        return {
+          backgroundColor: "#C4E1FF",
+          color: "#303133",
+        };
+      } else {
+        return {
+          backgroundColor: "#ACD6FF",
+          color: "#303133",
+        };
+      }
+    },
+  },
+};
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+</style>

src/xt_pages/stock/inventoryTransfer/transDetails.vue

@@ -0,0 +1,176 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+    </div>
+    <div class="app-container">
+      <el-table
+        :row-style="changColor"
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266',
+        }"
+        :data="tableData"
+        :class="signAndWeighBoxPatients"
+        border
+      >
+        >
+        <el-table-column align="center">
+          <template slot="header" slot-scope="scope">
+            商品名称<span style="color: red">*</span>
+          </template>
+          <template slot-scope="scope">
+            <span>{{ scope.row.Count ? scope.row.Count : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="商品类型" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.Count ? scope.row.Count : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="规格&&单位" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.outCount ? scope.row.outCount : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="调拨数量" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.outCount ? scope.row.outCount : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="调出仓库" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.outCount ? scope.row.outCount : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="调入仓库" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.outCount ? scope.row.outCount : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="库存总数" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.outCount ? scope.row.outCount : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="制单人" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.outCount ? scope.row.outCount : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="审核人" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.outCount ? scope.row.outCount : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="审核时间" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.outCount ? scope.row.outCount : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.outCount ? scope.row.outCount : "" }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[10, 50, 100, 200, 500, 1000]"
+        :page-size="10"
+        background
+        align="right"
+        style="margin-top: 20px"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      >
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
+export default {
+  components: {
+    BreadCrumb,
+  },
+  data() {
+    return {
+      crumbs: [
+        { path: false, name: "库房管理" },
+        { path: "/stock/warehousequery", name: "调拨详情" },
+      ],
+      value1: "",
+      total: 0,
+      page: 1,
+      limit: 10,
+      tableData: [{}, {}],
+      formInline: {
+        user: "",
+        region: "",
+      },
+      rules: {
+        region: [
+          { required: true, message: "请选择活动区域", trigger: "change" },
+        ],
+      },
+    };
+  },
+
+  methods: {
+    // 初始化数据
+    init() {},
+
+    // 反审核
+    approval() {},
+
+    // 审核
+    examine() {},
+
+    // 保存
+    save() {},
+
+    // 表单添加
+    toAdd() {},
+
+    // 删除
+    toDelete() {},
+
+    // 详情查看
+    toDetails() {},
+
+    // 表单全选
+    handleSelectionChange() {},
+
+    // 页表操作
+    handleSizeChange(val) {
+      this.limit = val;
+      this.init();
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.init();
+    },
+
+    // 表格样式
+    changColor({ rowIndex }) {
+      if (rowIndex % 2 == 1) {
+        return {
+          backgroundColor: "#C4E1FF",
+          color: "#303133",
+        };
+      } else {
+        return {
+          backgroundColor: "#ACD6FF",
+          color: "#303133",
+        };
+      }
+    },
+  },
+};
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+</style>

src/xt_pages/stock/inventoryTransfer/transEdit.vue

@@ -0,0 +1,821 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+      <div>
+        <el-button type="primary" @click="submit">保存</el-button>
+        <el-button type="warning" @click="examine" v-if="is_check == 2">审核</el-button>
+        <el-button type="warning" @click="approval" v-if="is_check == 1">反审核</el-button>
+      </div>
+    </div>
+    <div class="app-container" v-loading="loading">
+      <div
+        style="
+          justify-content: flex-start;
+          margin: 0px 0 12px 0;
+          display: flex;
+          align-items: center;
+        "
+      >
+        <el-form
+          :inline="true"
+          :model="formInline"
+          class="demo-form-inline"
+        >
+          <el-form-item label="单据日期：">
+            <el-date-picker
+              :disabled="store_disabled"
+              v-model="warehousing_time"
+              type="date"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+              placeholder="选择日期"
+            ></el-date-picker>
+          </el-form-item>
+          <span><span style="color:red">*</span>调出仓库：</span>
+          <el-form-item  prop="storehouse_out_id">
+              <el-select size="small" v-model="storehouse_out_id" filterable placeholder="请选择调出仓库"  :disabled="store_disabled"  @change="changeHouseList">
+                <el-option
+                  v-for="(option, index) in houseList"
+                  :key="index"
+                  :label="option.storehouse_name"
+                  :value="option.id">
+                </el-option>
+              </el-select>
+          </el-form-item>
+          <span><span style="color:red">*</span>调入仓库：</span>
+          <el-form-item prop="storehouse_in_id">
+            <el-select size="small" v-model="storehouse_in_id" filterable placeholder="请选择调入仓库"  :disabled="store_disabled">
+            <el-option
+              v-for="(option, index) in houseList"
+              :key="index"
+              :label="option.storehouse_name"
+              :value="option.id">
+            </el-option>
+           </el-select>
+          </el-form-item>
+        </el-form>
+      </div>
+     <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
+      <el-table
+        :row-style="changColor"
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266',
+        }"
+        :data="recordInfo.recordData"
+        border
+       
+      >
+      >
+    
+        <el-table-column align="center"  width="230">
+          <template slot="header" slot-scope="scope" >
+            商品名称<span style="color:red;">*</span>
+          </template>
+          <template slot-scope="scope">
+           <el-form-item
+                :prop="'recordData.' + scope.$index + '.name'"
+                :rules="tableRules.name"
+              >
+                <el-select
+                  v-model="scope.row.name"
+                  style="width:200"
+                  filterable
+                  placeholder="请选择商品"
+                  @change="changeName"
+                  @input="changeGoodName(scope.$index)"
+                  :disabled="store_disabled"
+                >
+                  <el-option
+                    v-for="(item, index) in tabList"
+                    :key="index"
+                    :label="item.project_name"
+                    :value="item"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+          </template>
+        </el-table-column>
+        <el-table-column align="center"  width="200">
+          <template slot="header" slot-scope="scope">
+              <span>商品类型<span style="color: red">*</span></span>
+            </template>
+     
+            <template slot-scope="scope">
+              <el-form-item style="padding-top: 20px;">
+                <el-input v-model="scope.row.project_type" :disabled="true" style="width:180px"></el-input>
+              </el-form-item>
+            </template>
+        </el-table-column>
+        <el-table-column  align="center" width="250">
+         <template slot="header" slot-scope="scope" >
+              <span>规格<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+
+              <el-form-item style="padding-top: 20px">
+                 <el-input v-model="scope.row.second_specification_name" style="width:200px" :disabled="true"></el-input>
+              </el-form-item>
+
+            </template>
+        </el-table-column>
+        <el-table-column  align="center" width="250">
+             <template slot="header" slot-scope="scope">
+              <span>调拨数量<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item style="padding-top: 20px" :prop="'recordData.' + scope.$index + '.count'"
+                            :rules='tableRules.count' >
+                <el-input v-model="scope.row.count" style="width:100px"  :disabled="store_disabled"  @input="selectCount(scope.row.project_id,scope.row.sencond_unit,scope.row.is_source,scope.row.count,scope.$index)"></el-input>
+                <el-select
+                 :disabled="store_disabled"
+                  v-model="scope.row.sencond_unit"
+                  style="width: 100px"
+                  filterable
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="(item, index) in scope.row.unitList"
+                    :key="index"
+                    :label="item.name"
+                    :value="item.name"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </template>
+        </el-table-column>
+        <el-table-column label="库存总数" align="center" width="200">
+           <template slot="header" slot-scope="scope">
+              <span>库存总数<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item  style="padding-top: 20px">
+                <el-input v-model="scope.row.second_total" style="width:150px" :disabled="true"></el-input>
+              </el-form-item>
+            </template>
+         </el-table-column>
+      
+        <el-table-column label="备注" align="center" width="200">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.remake" style="width:160px"  :disabled="store_disabled"></el-input>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="操作" align="center" width="190px">
+          <template slot-scope="scope">
+            <el-tooltip class="item" content="新增" placement="top-start">
+              <el-button
+                icon="el-icon-plus"
+                size="small"
+                type="primary"
+                @click="toAdd(scope.row)"
+              >
+              </el-button>
+            </el-tooltip>
+
+            <el-tooltip class="item" content="删除" placement="top-start">
+              <el-button
+                icon="el-icon-delete"
+                size="small"
+                type="danger"
+                @click="toDelete(scope.row, scope.$index)"
+              >
+              </el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import { uParseTime } from '@/utils/tools'
+import {getSencondeGoodList,updateSencondOrder,getSencondOrderDetail,returnCheckSecondOrder,getSumSecondeCount,checkSecondOrder,getStoreHouseGoodList,deleteSecondeOrderInfo} from '@/api/seconde'
+export default {
+  components: {
+    BreadCrumb,
+  },
+  data() {
+    return {
+      crumbs: [
+        { path: false, name: "库房管理" },
+        { path: "/stock/warehousequery", name: "编辑调拨" },
+      ],
+      value1: "",
+      total: 0,
+      page: 1,
+      limit: 10,
+      tableData: [{}, {}],
+      formInline: {
+        user: "",
+        region: "",
+      },
+      currentIndex: 0,
+      tableRules: {
+          name: [
+            { required: true, message: '商品名称不能为空', trigger: 'blur' }
+          ],
+          count: [
+            { required: true, message: '调拨数量不能为空', trigger: 'blur' }
+          ],
+        },
+        goodType: [],
+        manufacturerList:[],
+        goodList:[],
+        loading:false,
+        list:[],
+        configlist:{},
+        recordInfo: {
+          recordData: [],
+        },
+        drugList:[],
+        goodTypeList:[],
+        drugTypeList:[],
+        houseList:[],
+        tabList:[],
+        disabled:false,
+        storehouse_out_id:"",
+        storehouse_in_id:"",
+        is_check:0,
+        store_disabled:false,
+        loading:false,
+        warehousing_time:"",
+    };
+  },
+
+  methods: {
+    // 初始化数据
+    init() {},
+
+    // 反审核
+      
+    // 反审核
+    approval() {
+      this.loading = true
+      var id = this.$route.query.id
+      var array = []
+      array.push(id)
+      var ids = array.join(",")
+      returnCheckSecondOrder(ids).then(response=>{
+         if(response.data.state == 1){
+          this.loading = false
+          var msg = response.data.data.msg
+          if(msg == 0){
+            this.$message.success("反审核失败!")
+            this.getlist()
+          }
+          if(msg == 1){
+            this.$message.success("反审核成功!")
+            this.getlist()
+          }
+          if(msg == 2){
+            var good_name = response.data.data.good_name
+            var specification_name = response.data.data.specification_name
+            var storehose_name = response.data.data.storehose_name
+
+            this.$message.error(storehose_name + " "+good_name+"*"+specification_name+"库存不足,无法调拨,请修改调拨数量!")
+          }
+          if(msg == 3){
+            var drug_name =  response.data.data.drug_name
+            var dose = response.data.data.dose
+            var dose_unit = response.data.data.dose_unit
+            var min_number = response.data.data.min_number
+            var min_unit =  response.data.data.min_unit
+            var max_unit =  response.data.data.max_unit
+            var str = drug_name + " " + dose + dose_unit + "*" + min_number + min_unit+"/"+max_unit
+            var storehose_name = response.data.data.storehose_name
+            this.$message.error(storehose_name +" "+str +"库存不足,无法调拨,请修改调拨数量!")
+
+          }
+         }
+      })
+
+    },
+    // 审核
+    examine() {
+      this.loading= true
+      var array = []
+      var id = parseInt(this.$route.query.id)
+      array.push(id)
+      var ids = array.join(",")
+      console.log("ids233232232332",array)
+      checkSecondOrder(ids).then(response=>{
+        if(response.data.state == 1){
+          var msg = response.data.data.msg
+          this.loading = false
+          if(msg == 1){
+            this.$message.success("审核成功!")
+            this.$router.push({path:"/stock/inventoryTransfer"})
+          }
+          if(msg == 2){
+            var good_name = response.data.data.good_name
+            var specification_name = response.data.data.specification_name
+            var storehose_name = response.data.data.storehose_name
+
+            this.$message.error(storehose_name + " "+good_name+"*"+specification_name+"库存不足,无法调拨,请修改调拨数量!")
+          }
+          if(msg == 3){
+            var drug_name =  response.data.data.drug_name
+            var dose = response.data.data.dose
+            var dose_unit = response.data.data.dose_unit
+            var min_number = response.data.data.min_number
+            var min_unit =  response.data.data.min_unit
+            var max_unit =  response.data.data.max_unit
+            var str = drug_name + " " + dose + dose_unit + "*" + min_number + min_unit+"/"+max_unit
+            var storehose_name = response.data.data.storehose_name
+            this.$message.error(storehose_name +" "+str +"库存不足,无法调拨,请修改调拨数量!")
+
+          }
+
+        }
+      })
+    },
+
+    // 表单添加
+    toAdd() {
+      if(this.is_check == 1){
+       this.$message.error("已审核的数据不能新增!")
+       return 
+      }
+      const tempObj = {}
+      tempObj["id"] = 0
+      tempObj["name"] = "";
+      tempObj['project_name'] = ""
+      tempObj['project_type'] = ""
+      tempObj['second_specification_name'] = ''
+      tempObj['sencond_unit'] = ''
+      tempObj['count'] = ''
+      tempObj['second_total'] = ''
+      tempObj["is_source"] = 0
+      tempObj["remake"] = ''
+      tempObj["project_id"] = 0
+      tempObj["min_price"] = 0
+      this.recordInfo.recordData.push(tempObj)
+    },
+
+    // 删除
+    toDelete(val,index) {
+      if(this.is_check == 1){
+        this.$message.error("已审核的数据不能删除!")
+        return 
+      }
+      if (this.recordInfo.recordData.length <= 1) {
+        this.$message.error('只有一条记录的时候无法删除')
+        return
+      }
+      this.$confirm("确认删除吗?", "删除", {
+        confirmButtonText: "确 定",
+        cancelButtonText: "取 消",
+        type: "warning",
+      }).then(() => {
+        deleteSecondeOrderInfo(val.id).then((response) => {
+            if (response.data.state == 1) {
+              var msg = response.data.data.msg;
+              this.$message.success("删除成功");
+              this.recordInfo.recordData.splice(index, 1)
+            } else {
+              this.$message.error("删除失败");
+            }
+          });
+        }).catch(() => {});
+    },
+
+    // 详情查看
+    toDetails() {},
+
+    // 表单全选
+    handleSelectionChange() {},
+
+    // 页表操作
+    handleSizeChange(val) {
+      this.limit = val;
+      this.init();
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.init();
+    },
+
+    // 表格样式
+    changColor({ rowIndex }) {
+      if (rowIndex % 2 == 1) {
+        return {
+          backgroundColor: "#C4E1FF",
+          color: "#303133",
+        };
+      } else {
+        return {
+          backgroundColor: "#ACD6FF",
+          color: "#303133",
+        };
+      }
+    },
+    //获取基本数据信息
+    getlist(){
+      getSencondeGoodList().then(response=>{
+        if(response.data.state == 1){
+         
+          var houseList =  response.data.data.houseList
+          this.houseList = houseList
+
+        }
+      })
+    },
+    getTime(val, temp) {
+      if (val != 0) {
+        return uParseTime(val, temp)
+      } else {
+        return ''
+      }
+    },
+    changeGoodName(val) {
+      this.currentIndex = val;
+    },
+    changeName(val) {
+      for (let i = 0; i < this.recordInfo.recordData.length; i++) {
+        if (this.currentIndex == i) {
+          this.recordInfo.recordData[i].project_id = val.id;
+          this.recordInfo.recordData[i].is_source = val.is_source;
+          this.recordInfo.recordData[i].name = val.name;
+          this.recordInfo.recordData[i].project_name = val.project_name;
+          this.recordInfo.recordData[i].project_type = val.project_type;
+          this.recordInfo.recordData[i].second_specification_name = val.second_specification_name;
+          this.recordInfo.recordData[i].second_total = val.second_total;
+          this.recordInfo.recordData[i].sencond_unit = val.sencond_unit
+          this.recordInfo.recordData[i].min_price = val.min_price
+          if (val.count == NaN) {
+            this.recordInfo.recordData[i].count = "";
+          } else {
+            this.recordInfo.recordData[i].count = val.count? val.count : "";
+          }
+          this.recordInfo.recordData[i].unitList = val.unitList;
+        }
+      }
+    },
+    getWarehoseInfo(arr, max_unit, min_unit, min_number) {
+        var total = 0;
+        var max_str = "";
+        var min_str = "";
+        if (arr.length > 0) {
+            for (let i = 0; i < arr.length; i++) {
+            total += parseInt(arr[i].stock_max_number + arr[i].stock_min_number);
+            }
+        }
+        if (total < min_number) {
+            min_str = total + min_unit;
+        }
+        if (total == 0) {
+            min_str = "";
+            max_str = "";
+        }
+        if (total >= min_number) {
+            if (parseInt(total / min_number) != 0) {
+            max_str = parseInt(total / min_number) + max_unit;
+            }
+            if (total % min_number != 0) {
+            min_str = (total % min_number) + min_unit;
+            }
+        }
+        return max_str + min_str;
+      },
+      getTotalStockCount(arr) {
+        var total_count = 0;
+        for (let i = 0; i < arr.length; i++) {
+            total_count += arr[i].stock_count;
+        }
+        return total_count;
+      },
+    getSencondOrderDetail(){
+       var id = parseInt(this.$route.query.id)
+      getSencondOrderDetail(id).then(response=>{
+         if(response.data.state == 1){
+           var warehouse = response.data.data.warehouse
+           this.storehouse_in_id = warehouse.storehouse_in_id
+           this.storehouse_out_id = warehouse.storehouse_out_id
+           this.is_check = warehouse.is_check
+
+           if(warehouse.is_check == 1){
+             this.store_disabled = true
+           }
+           if(warehouse.is_check == 2){
+             this.store_disabled = false
+           }
+           var list = response.data.data.list
+           for(let i=0;i<list.length;i++){
+              list[i].id = list[i].id
+              list[i].name = list[i].project_name
+           }
+           this.recordInfo.recordData = list
+          this.warehousing_time = this.getTime(warehouse.record_date,"{y}-{m}-{d}")
+          var drugList = response.data.data.drugList
+          this.drugList= drugList
+          var goodList = response.data.data.goodList
+          this.goodList = goodList
+          var manufactuerList = response.data.data.manufacturerList
+          console.log("manufactuerList233232",manufactuerList)
+          var goodTypeList = response.data.data.goodTypeList
+          this.goodTypeList = goodTypeList
+          var drugTypeList = response.data.data.drugTypeList
+          this.drugTypeList = drugTypeList
+
+          for(let i=0;i<drugList.length;i++){
+            for (let j = 0; j < manufactuerList.length; j++) {
+              if (drugList[i].manufacturer == manufactuerList[j].id) {
+                drugList[i].manufacturer = manufactuerList[j].manufacturer_name;
+              }
+            }
+            for (let z = 0; z < drugList[i].drug_warehouse_info.length; z++) {
+              if (drugList[i].max_unit ==drugList[i].drug_warehouse_info[z].max_unit) {
+                  drugList[i].drug_warehouse_info[z].stock_max_number = drugList[i].drug_warehouse_info[z].stock_max_number *drugList[i].min_number;
+              }
+              }
+              for (let y = 0; y < this.drugTypeList.length; y++) {
+                if (drugList[i].drug_type == this.drugTypeList[y].value) {
+                    drugList[i].drug_type = this.drugTypeList[y].name;
+                  }
+              }
+              drugList[i].name =drugList[i].drug_name 
+              drugList[i].project_name =drugList[i].drug_name + " " +drugList[i].dose + drugList[i].dose_unit + "*" +drugList[i].min_number +drugList[i].min_unit + "/" + drugList[i].max_unit + " " +drugList[i].manufacturer;
+              drugList[i].project_type = drugList[i].drug_type;
+              drugList[i].second_specification_name = drugList[i].dose + drugList[i].dose_unit +"*" + drugList[i].min_number +drugList[i].min_unit +"/" + drugList[i].max_unit;
+              drugList[i].second_total = this.getWarehoseInfo(drugList[i].drug_warehouse_info,drugList[i].max_unit,drugList[i].min_unit,drugList[i].min_number);
+              drugList[i].is_source = 1
+              drugList[i].count = ""
+              drugList[i].remake = ""
+              drugList[i].min_price = drugList[i].min_price
+            if (drugList[i].max_unit != drugList[i].min_unit) {
+              drugList[i].unitList = [
+                  { id: 1, name: "" },
+                  { id: 2, name: "" },
+              ];
+            }
+            if (drugList[i].max_unit == drugList[i].min_unit) {
+                drugList[i].unitList = [{ id: 1, name: "" }];
+            }
+
+           drugList[i].sencond_unit = drugList[i].max_unit;
+            for (let j = 0; j < drugList[i].unitList.length; j++) {
+              if (drugList[i].max_unit != drugList[i].min_unit) {
+                drugList[i].unitList[0].name = drugList[i].max_unit;
+                drugList[i].unitList[1].name = drugList[i].min_unit;
+              }
+              if (drugList[i].max_unit == drugList[i].min_unit) {
+                drugList[i].unitList[0].name = drugList[i].max_unit;
+              }
+            }
+          this.tabList.push(drugList[i]);
+          }
+
+            for (let i = 0; i < goodList.length; i++) {
+              for (let j = 0; j < manufactuerList.length; j++) {
+                if (goodList[i].manufacturer == manufactuerList[j].id) {
+                    goodList[i].manufacturer = manufactuerList[j].manufacturer_name;
+                }
+              }
+              for (let y = 0; y < this.goodTypeList.length; y++) {
+                if (goodList[i].good_type_id == this.goodTypeList[y].id) {
+                  goodList[i].good_type_id = this.goodTypeList[y].type_name;
+                }
+              }
+              goodList[i].name = goodList[i].good_name
+              goodList[i].project_name = goodList[i].good_name + " " + goodList[i].specification_name + " " + goodList[i].manufacturer;
+              goodList[i].project_type = goodList[i].good_type_id;
+              goodList[i].second_specification_name = goodList[i].specification_name;
+              goodList[i].second_total = this.getTotalStockCount(
+                goodList[i].good_warehouse_info
+              );
+              goodList[i].count = ""
+              goodList[i].is_source = 2;
+              goodList[i].name = goodList[i].good_name;
+              goodList[i].unitList = [{ id: 1, name: "" }];
+              goodList[i].sencond_unit = goodList[i].packing_unit;
+              goodList[i].remake = ""
+              goodList[i].min_price = goodList[i].retail_price
+              for (let j = 0; j < goodList[i].unitList.length; j++) {
+                goodList[i].unitList[0].name = goodList[i].packing_unit;
+              }
+              this.tabList.push(goodList[i]);
+            }
+         }
+      })   
+    },
+    submit() {
+        this.$refs['tableForm'].validate((valid) => {
+          if (valid) {
+            const loading = this.$loading({
+              lock: true,
+              text: 'Loading',
+              spinner: 'el-icon-loading',
+              background: 'rgba(0, 0, 0, 0.7)'
+            })
+            this.loading = true
+            const array = this.recordInfo.recordData
+            if(this.storehouse_in_id <=0){
+              this.$message.error("调入仓库不能为空!")
+              this.loading = false
+              loading.close()
+              return
+            }
+            if(this.storehouse_out_id <=0){
+              this.$message.error("调出仓库不能为空!")
+              this.loading = false
+              loading.close()
+              return
+            }
+            for (let i = 0; i < array.length; i++) {
+              array[i].count = parseInt(array[i].count)
+              array[i].second_total = array[i].second_total.toString()
+            }
+
+            const params = {
+              'stockIn': this.recordInfo.recordData
+            }
+            var storehouse_in_id = parseInt(this.storehouse_in_id)
+            var storehouse_out_id = parseInt(this.storehouse_out_id)
+            var id = parseInt(this.$route.query.id)
+            var warehouse_time =  this.warehousing_time
+            
+            updateSencondOrder(params,warehouse_time,storehouse_in_id,storehouse_out_id,id).then(response => {
+              if (response.data.state == 1) {
+                var warehousingInfo = response.data.data.warehousingInfo   
+                this.$message.success('保存成功')
+                this.loading = false 
+                loading.close()
+                this.$router.push({path:"/stock/inventoryTransfer"})
+              } else {
+                this.$message.error("保存失败")
+                loading.close()
+                this.loading = false
+              }
+            })
+          } else {
+            return false
+          }
+        })
+      },
+    selectCount(project_id,sencond_unit,is_source,count,index){
+      var params = {
+        project_id:project_id,
+        sencond_unit:sencond_unit,
+        is_source:parseInt(is_source),
+        count:parseInt(count),
+        storehouse_out_id:this.storehouse_out_id
+      }
+      console.log("params23323232",params)
+      getSumSecondeCount(params).then(response=>{
+         if(response.data.state == 1){
+           var msg = response.data.data.msg
+           if(msg == 2){
+             this.$message.error("调拨数量不能大于库存总量!")
+             for(let i=0;i<this.recordInfo.recordData.length;i++){
+               if(index == i){
+                 this.recordInfo.recordData[i].count = ""
+               }
+             }
+           }
+         }
+      })
+
+    },
+
+     changeHouseList(){
+         var params = {
+           storehouse_out_id:this.storehouse_out_id,
+         }
+        console.log("para323232233223",params)
+        getStoreHouseGoodList(params).then(response=>{
+          var drugList = response.data.data.drugList
+          this.drugList = []
+          this.drugList= drugList
+          var goodList = response.data.data.goodList
+          this.goodList = []
+          this.goodList = goodList
+          var goodTypeList = response.data.data.goodTypeList
+          this.goodTypeList = []
+          this.goodTypeList = goodTypeList
+          var drugTypeList = response.data.data.drugTypeList
+          this.drugTypeList = []
+          this.drugTypeList = drugTypeList
+          this.tabList = []
+          var manufactuerList = response.data.data.manufacturerList
+          console.log("manufactuerList23323232",manufactuerList)
+          for(let i=0;i<drugList.length;i++){
+             for (let j = 0; j < manufactuerList.length; j++) {
+                if (drugList[i].manufacturer == manufactuerList[j].id) {
+                  drugList[i].manufacturer = manufactuerList[j].manufacturer_name;
+                }
+              }
+            for (let z = 0; z < drugList[i].drug_warehouse_info.length; z++) {
+              if (drugList[i].max_unit ==drugList[i].drug_warehouse_info[z].max_unit) {
+                  drugList[i].drug_warehouse_info[z].stock_max_number = drugList[i].drug_warehouse_info[z].stock_max_number *drugList[i].min_number;
+              }
+              }
+              for (let y = 0; y < this.drugTypeList.length; y++) {
+                if (drugList[i].drug_type == this.drugTypeList[y].value) {
+                    drugList[i].drug_type = this.drugTypeList[y].name;
+                  }
+              }
+              drugList[i].name =drugList[i].drug_name 
+              drugList[i].project_name =drugList[i].drug_name + " " +drugList[i].dose + drugList[i].dose_unit + "*" +drugList[i].min_number +drugList[i].min_unit + "/" + drugList[i].max_unit + " " +drugList[i].manufacturer;
+              drugList[i].project_type = drugList[i].drug_type;
+              drugList[i].second_specification_name = drugList[i].dose + drugList[i].dose_unit +"*" + drugList[i].min_number +drugList[i].min_unit +"/" + drugList[i].max_unit;
+              drugList[i].second_total = this.getWarehoseInfo(drugList[i].drug_warehouse_info,drugList[i].max_unit,drugList[i].min_unit,drugList[i].min_number);
+              drugList[i].is_source = 1
+              drugList[i].count = ""
+              drugList[i].remake = ""
+              drugList[i].min_price = drugList[i].min_price
+            if (drugList[i].max_unit != drugList[i].min_unit) {
+              drugList[i].unitList = [
+                  { id: 1, name: "" },
+                  { id: 2, name: "" },
+              ];
+            }
+          if (drugList[i].max_unit == drugList[i].min_unit) {
+              drugList[i].unitList = [{ id: 1, name: "" }];
+          }
+
+          drugList[i].sencond_unit = drugList[i].max_unit;
+          for (let j = 0; j < drugList[i].unitList.length; j++) {
+            if (drugList[i].max_unit != drugList[i].min_unit) {
+              drugList[i].unitList[0].name = drugList[i].max_unit;
+              drugList[i].unitList[1].name = drugList[i].min_unit;
+            }
+            if (drugList[i].max_unit == drugList[i].min_unit) {
+              drugList[i].unitList[0].name = drugList[i].max_unit;
+            }
+          }
+          this.tabList.push(drugList[i]);
+          }
+
+        for (let i = 0; i < goodList.length; i++) {
+          for (let j = 0; j < manufactuerList.length; j++) {
+            if (goodList[i].manufacturer == manufactuerList[j].id) {
+                goodList[i].manufacturer = manufactuerList[j].manufacturer_name;
+            }
+          }
+          for (let y = 0; y < this.goodTypeList.length; y++) {
+            if (goodList[i].good_type_id == this.goodTypeList[y].id) {
+              goodList[i].good_type_id = this.goodTypeList[y].type_name;
+            }
+          }
+          goodList[i].name = goodList[i].good_name
+          goodList[i].project_name = goodList[i].good_name + " " + goodList[i].specification_name + " " + goodList[i].manufacturer;
+          goodList[i].project_type = goodList[i].good_type_id;
+          goodList[i].second_specification_name = goodList[i].specification_name;
+          goodList[i].second_total = this.getTotalStockCount(
+            goodList[i].good_warehouse_info
+          );
+          goodList[i].count = ""
+          goodList[i].is_source = 2;
+          goodList[i].name = goodList[i].good_name;
+          goodList[i].unitList = [{ id: 1, name: "" }];
+          goodList[i].sencond_unit = goodList[i].packing_unit;
+          goodList[i].remake = ""
+          goodList[i].min_price = goodList[i].retail_price
+          for (let j = 0; j < goodList[i].unitList.length; j++) {
+            goodList[i].unitList[0].name = goodList[i].packing_unit;
+          }
+          this.tabList.push(goodList[i]);
+        }
+       })
+      },
+  },
+  created(){
+    // var nowDate = new Date()
+    // var nowYear = nowDate.getFullYear()
+    // var nowMonth = nowDate.getMonth() + 1
+    // var nowDay = nowDate.getDate()
+    // this.warehousing_time =
+    //   nowYear +
+    //   '-' +
+    //   (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+    //   '-' +
+    //   (nowDay < 10 ? '0' + nowDay : nowDay)
+    const tempObj = {}
+    tempObj["id"] =  0;
+    tempObj["name"] = "";
+    tempObj['project_name'] = ""
+    tempObj['project_type'] = ""
+    tempObj['second_specification_name'] = ''
+    tempObj['sencond_unit'] = ''
+    tempObj['count'] = ''
+    tempObj['second_total'] = ''
+    tempObj["remake"] = ''
+    tempObj["is_source"] = 0
+    tempObj["project_id"] = 0
+    tempObj["min_price"] = 0
+    this.recordInfo.recordData.push(tempObj)
+    this.getlist()  
+    this.getSencondOrderDetail()
+  }
+};
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+</style>

src/xt_pages/stock/testOrder.vue

@@ -0,0 +1,536 @@
+<template>
+
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb  :crumbs='crumbs'></bread-crumb>
+     
+      <div style="float:right;">
+        <el-button size="small" @click="back()" class="filter-item">取 消</el-button>
+        <el-button size="small" type="primary" @click="submit()" class="filter-item">保 存</el-button>
+      </div>
+    </div>
+    <div class="app-container" v-loading="loading">
+
+      <div class="cell clearfix">
+      
+        <label class="title"><span class="name">入库时间</span> : </label>
+        <el-date-picker size="small" v-model="warehousing_time" prefix-icon="el-icon-date" :editable="false"
+                        style="width: 196px;" type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd"></el-date-picker>
+       <label class="title"><span class="name">调入仓库</span> : </label>
+        <el-select size="small" v-model="storehouse_in_id" filterable placeholder="请选择仓库">
+          <el-option
+            v-for="(option, index) in houseList"
+            :key="index"
+            :label="option.storehouse_name"
+            :value="option.id">
+          </el-option>
+        </el-select>
+
+        <label class="title"><span class="name">调出仓库</span> : </label>
+        <el-select size="small" v-model="storehouse_out_id" filterable placeholder="请选择仓库">
+          <el-option
+            v-for="(option, index) in houseList"
+            :key="index"
+            :label="option.storehouse_name"
+            :value="option.id">
+          </el-option>
+        </el-select>
+      </div>
+
+    
+      <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
+        <el-table id="oictable" :data="recordInfo.recordData" :class="signAndWeighBoxPatients" border
+                  style="width: 100%"
+                  max-height="450" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+        >
+          <el-table-column align="center" width="200" fixed="left">
+             <template slot="header" slot-scope="scope">
+              <span>商品名称</span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item
+                :prop="'tableList.' + scope.$index + '.name'"
+                :rules="tableRules.name"
+              >
+                <el-select
+                  v-model="scope.row.name"
+                  style="width: 160"
+                  filterable
+                  placeholder="请选择商品"
+                  @change="changeName"
+                  @input="changeGoodName(scope.$index)"
+                  :disabled="disabled"
+                >
+                  <el-option
+                    v-for="(item, index) in tabList"
+                    :key="index"
+                    :label="item.project_name"
+                    :value="item"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" width="200">
+            
+            <template slot="header" slot-scope="scope">
+              <span>商品类型<span style="color: red">*</span></span>
+            </template>
+     
+            <template slot-scope="scope">
+              <el-form-item style="padding-top: 20px;">
+                <el-input v-model="scope.row.project_type" :disabled="true" style="width:180px"></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" width="300">
+            
+            <template slot="header" slot-scope="scope">
+              <span>规格<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+
+              <el-form-item style="padding-top: 20px">
+                 <el-input v-model="scope.row.second_specification_name" style="width:200px" :disabled="true"></el-input>
+              </el-form-item>
+
+            </template>
+          </el-table-column>
+        
+          <el-table-column align="center" width="250">
+            <template slot="header" slot-scope="scope">
+              <span>调拨数量<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item style="padding-top: 20px" :prop="'recordData.' + scope.$index + '.number'"
+                            :rules='tableRules.number' >
+                <el-input v-model="scope.row.count" style="width:100px"></el-input>
+                <el-select
+                  v-model="scope.row.sencond_unit"
+                  style="width: 100px"
+                  filterable
+                  placeholder="请选择"
+                  :disabled="disabled"
+                >
+                  <el-option
+                    v-for="(item, index) in scope.row.unitList"
+                    :key="index"
+                    :label="item.name"
+                    :value="item.name"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </template>
+          </el-table-column>
+
+
+    
+          <el-table-column align="center" width="220">
+            <template slot="header" slot-scope="scope">
+              <span>库存总数<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+            
+              <el-form-item :prop="'recordData.' + scope.$index + '.packing_price'" :rules='tableRules.packing_price'
+                            style="padding-top: 20px">
+                <el-input v-model="scope.row.second_total" style="width:200px"></el-input>
+              </el-form-item>
+
+
+            </template>
+          </el-table-column>
+      
+          <el-table-column label="备注" align="center" width="300">
+            <template slot-scope="scope">
+               <el-input v-model="scope.row.remake" style="width:200px"></el-input>
+            </template>
+          </el-table-column>
+          
+          <el-table-column label="操作" align="center" fixed="right" width="150">
+            <template slot-scope="scope">
+              <el-tooltip class="item" effect="dark" content="新增" placement="top">
+                <el-button
+                  size="mini"
+                  type="primary"
+                  icon="el-icon-circle-plus-outline"
+                  @click="handleEdit(scope.$index, scope.row)">
+                </el-button>
+              </el-tooltip>
+              <el-tooltip class="item" effect="dark" content="删除" placement="top">
+
+                <el-button
+                  size="mini"
+                  type="danger"
+                  icon="el-icon-delete"
+                  @click="handleDelete(scope.$index, scope.row)">
+                </el-button>
+              </el-tooltip>
+
+            </template>
+          </el-table-column>
+
+        </el-table>
+      </el-form>
+
+
+    </div>
+  </div>
+
+</template>
+
+<script>
+  import { uParseTime } from '@/utils/tools'
+  import {getSencondeGoodList,saveSencondOrder} from '@/api/seconde'
+  import BreadCrumb from '../components/bread-crumb'
+
+  export default {
+    components: { BreadCrumb },
+    name: 'stockIn',
+
+    data() {
+     
+      return {
+        crumbs: [
+          { path: false, name: '库存管理' },
+          { path: false, name: '耗材入库单' },
+          { path: false, name: '新增入库单' }
+        ],
+        crumbs2: [
+          { path: false, name: '库存管理' },
+          { path: false, name: '其他入库单' },
+          { path: false, name: '新增入库单' }
+        ],
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        warehousing_time: '',
+        adminUserOptions: null,
+        currentIndex: 0,
+        tableRules: {
+          price: [
+            { required: true, message: '单价不能为空', trigger: 'blur' }
+          ],
+        },
+        goodType: [],
+        manufacturerList:[],
+        goodList:[],
+        loading:false,
+        list:[],
+        configlist:{},
+        recordInfo: {
+          recordData: [],
+        },
+        drugList:[],
+        goodTypeList:[],
+        drugTypeList:[],
+        houseList:[],
+        tabList:[],
+        disabled:false,
+        storehouse_out_id:"",
+        storehouse_in_id:"",
+      }
+    },
+    methods: {
+      handleEdit: function(index, row) {
+        const tempObj = {}
+        tempObj["name"] = "";
+        tempObj['project_name'] = ""
+        tempObj['project_type'] = ""
+        tempObj['second_specification_name'] = ''
+        tempObj['sencond_unit'] = ''
+        tempObj['count'] = ''
+        tempObj['second_total'] = ''
+        tempObj["is_source"] = 0
+        tempObj["remake"] = ''
+        tempObj["project_id"] = 0
+        tempObj["min_price"] = 0
+        this.recordInfo.recordData.push(tempObj)
+      }, 
+      handleDelete: function(index, row) {
+        if (this.recordInfo.recordData.length <= 1) {
+          this.$message.error('只有一条记录的时候无法删除')
+          return
+        } else {
+          this.recordInfo.recordData.splice(index, 1)
+        }
+      }, calculate: function(val) {
+        if (val == 0) {
+          return ''
+        }
+        return Math.round(parseFloat(val) * 100) / 100
+      }, 
+    getTime(val, temp) {
+        if (val != 0) {
+          return uParseTime(val, temp)
+        } else {
+          return ''
+        }
+      },
+      submit() {
+        if(this.storehouse_out_id <=0){
+          this.$message.error("调出仓库不能为空!")
+          return
+        }
+        if(this.storehouse_in_id <=0){
+          this.$message.error("调入仓库不能为空!")
+          return
+        }
+        this.$refs['tableForm'].validate((valid) => {
+          if (valid) {
+            this.loading = true
+            const array = this.recordInfo.recordData
+           
+          
+            for (let i = 0; i < array.length; i++) {
+              array[i].count = parseInt(array[i].count)
+              array[i].second_total = array[i].second_total.toString()
+            }
+
+            const loading = this.$loading({
+              lock: true,
+              text: 'Loading',
+              spinner: 'el-icon-loading',
+              background: 'rgba(0, 0, 0, 0.7)'
+            })
+            const params = {
+              'stockIn': this.recordInfo.recordData
+            }
+            var storehouse_in_id = parseInt(this.storehouse_in_id)
+            var storehouse_out_id = parseInt(this.storehouse_out_id)
+            saveSencondOrder(params, this.warehousing_time,storehouse_in_id,storehouse_out_id).then(response => {
+              if (response.data.state == 1) {
+                var warehousingInfo = response.data.data.warehousingInfo   
+                this.$message.success('保存成功')
+                this.loading = false 
+                loading.close()
+              } else {
+                this.$message.error("保存失败")
+                loading.close()
+              }
+            })
+          } else {
+            return false
+          }
+        })
+      },
+      changeGoodName(val){
+        this.currentIndex = val
+      },
+      //获取基本数据信息
+      getlist(){
+       getSencondeGoodList().then(response=>{
+         if(response.data.state == 1){
+            var drugList = response.data.data.drugList
+            this.drugList= drugList
+            var goodList = response.data.data.goodList
+            this.goodList = goodList
+            var manufactuerList = response.data.data.manufactuerList
+            var goodTypeList = response.data.data.goodTypeList
+            this.goodTypeList = goodTypeList
+            var drugTypeList = response.data.data.drugTypeList
+            this.drugTypeList = drugTypeList
+            var houseList =  response.data.data.houseList
+            this.houseList = houseList
+
+            for(let i=0;i<drugList.length;i++){
+              for (let z = 0; z < drugList[i].drug_warehouse_info.length; z++) {
+                if (drugList[i].max_unit ==drugList[i].drug_warehouse_info[z].max_unit) {
+                    drugList[i].drug_warehouse_info[z].stock_max_number = drugList[i].drug_warehouse_info[z].stock_max_number *drugList[i].min_number;
+                }
+               }
+               for (let y = 0; y < this.drugTypeList.length; y++) {
+                  if (drugList[i].drug_type == this.drugTypeList[y].value) {
+                     drugList[i].drug_type = this.drugTypeList[y].name;
+                   }
+                }
+                drugList[i].name =drugList[i].drug_name + " " +drugList[i].dose + drugList[i].dose_unit + "*" +drugList[i].min_number +drugList[i].min_unit + "/" + drugList[i].max_unit + " " +drugList[i].manufacturer;
+                drugList[i].project_name =drugList[i].drug_name + " " +drugList[i].dose + drugList[i].dose_unit + "*" +drugList[i].min_number +drugList[i].min_unit + "/" + drugList[i].max_unit + " " +drugList[i].manufacturer;
+                drugList[i].project_type = drugList[i].drug_type;
+                drugList[i].second_specification_name = drugList[i].dose + drugList[i].dose_unit +"*" + drugList[i].min_number +drugList[i].min_unit +"/" + drugList[i].max_unit;
+                drugList[i].second_total = this.getWarehoseInfo(drugList[i].drug_warehouse_info,drugList[i].max_unit,drugList[i].min_unit,drugList[i].min_number);
+                drugList[i].is_source = 1
+                drugList[i].count = ""
+                drugList[i].remake = ""
+                drugList[i].min_price = drugList[i].min_price
+             if (drugList[i].max_unit != drugList[i].min_unit) {
+                drugList[i].unitList = [
+                    { id: 1, name: "" },
+                    { id: 2, name: "" },
+                ];
+             }
+            if (drugList[i].max_unit == drugList[i].min_unit) {
+               drugList[i].unitList = [{ id: 1, name: "" }];
+            }
+
+            drugList[i].sencond_unit = drugList[i].max_unit;
+            for (let j = 0; j < drugList[i].unitList.length; j++) {
+              if (drugList[i].max_unit != drugList[i].min_unit) {
+                drugList[i].unitList[0].name = drugList[i].max_unit;
+                drugList[i].unitList[1].name = drugList[i].min_unit;
+              }
+              if (drugList[i].max_unit == drugList[i].min_unit) {
+                drugList[i].unitList[0].name = drugList[i].max_unit;
+              }
+            }
+            this.tabList.push(drugList[i]);
+            }
+
+           for (let i = 0; i < goodList.length; i++) {
+            for (let y = 0; y < this.goodTypeList.length; y++) {
+              if (goodList[i].good_type_id == this.goodTypeList[y].id) {
+                goodList[i].good_type_id = this.goodTypeList[y].type_name;
+              }
+            }
+            goodList[i].project_name = goodList[i].good_name + " " + goodList[i].specification_name + " " + goodList[i].manufacturer;
+            goodList[i].project_type = goodList[i].good_type_id;
+            goodList[i].second_specification_name = goodList[i].specification_name;
+            goodList[i].second_total = this.getTotalStockCount(
+              goodList[i].good_warehouse_info
+            );
+            goodList[i].count = ""
+            goodList[i].is_source = 2;
+            goodList[i].name = goodList[i].good_name;
+            goodList[i].unitList = [{ id: 1, name: "" }];
+            goodList[i].sencond_unit = goodList[i].packing_unit;
+            goodList[i].remake = ""
+            goodList[i].min_price = goodList[i].retail_price
+            for (let j = 0; j < goodList[i].unitList.length; j++) {
+              goodList[i].unitList[0].name = goodList[i].packing_unit;
+            }
+            this.tabList.push(goodList[i]);
+          }
+            
+         }
+       })
+      },
+      
+      getWarehoseInfo(arr, max_unit, min_unit, min_number) {
+        var total = 0;
+        var max_str = "";
+        var min_str = "";
+        if (arr.length > 0) {
+            for (let i = 0; i < arr.length; i++) {
+            total += parseInt(arr[i].stock_max_number + arr[i].stock_min_number);
+            }
+        }
+        if (total < min_number) {
+            min_str = total + min_unit;
+        }
+        if (total == 0) {
+            min_str = "";
+            max_str = "";
+        }
+        if (total >= min_number) {
+            if (parseInt(total / min_number) != 0) {
+            max_str = parseInt(total / min_number) + max_unit;
+            }
+            if (total % min_number != 0) {
+            min_str = (total % min_number) + min_unit;
+            }
+        }
+        return max_str + min_str;
+      },
+      getTotalStockCount(arr) {
+        var total_count = 0;
+        for (let i = 0; i < arr.length; i++) {
+            total_count += arr[i].stock_count;
+        }
+        return total_count;
+      },
+     changeGoodName(val) {
+      this.currentIndex = val;
+    },
+    changeName(val) {
+      for (let i = 0; i < this.recordInfo.recordData.length; i++) {
+        if (this.currentIndex == i) {
+          this.recordInfo.recordData[i].project_id = val.id;
+          this.recordInfo.recordData[i].is_source = val.is_source;
+          this.recordInfo.recordData[i].name = val.name;
+          this.recordInfo.recordData[i].project_name = val.project_name;
+          this.recordInfo.recordData[i].project_type = val.project_type;
+          this.recordInfo.recordData[i].second_specification_name = val.second_specification_name;
+          this.recordInfo.recordData[i].second_total = val.second_total;
+          this.recordInfo.recordData[i].sencond_unit = val.sencond_unit
+          this.recordInfo.recordData[i].min_price = val.min_price
+          if (val.count == NaN) {
+            this.recordInfo.recordData[i].count = "";
+          } else {
+            this.recordInfo.recordData[i].count = val.count? val.count : "";
+          }
+          this.recordInfo.recordData[i].unitList = val.unitList;
+        }
+      }
+    },
+    },
+    created() {
+      var nowDate = new Date()
+      var nowYear = nowDate.getFullYear()
+      var nowMonth = nowDate.getMonth() + 1
+      var nowDay = nowDate.getDate()
+      this.warehousing_time =
+        nowYear +
+        '-' +
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+        '-' +
+        (nowDay < 10 ? '0' + nowDay : nowDay)
+      const tempObj = {}
+      tempObj["name"] = "";
+      tempObj['project_name'] = ""
+      tempObj['project_type'] = ""
+      tempObj['second_specification_name'] = ''
+      tempObj['sencond_unit'] = ''
+      tempObj['count'] = ''
+      tempObj['second_total'] = ''
+      tempObj["remake"] = ''
+      tempObj["is_source"] = 0
+      tempObj["project_id"] = 0
+      tempObj["min_price"] = 0
+      this.recordInfo.recordData.push(tempObj)
+      this.getlist()
+    }
+
+  }
+</script>
+
+<style>
+  #oictable ::-webkit-scrollbar {
+    height: 15px;
+  }
+</style>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+
+  }
+
+  .edit_separater {
+    border-top: 1px solid rgb(233, 233, 233);
+    margin-top: 15px;
+    margin-bottom: 15px;
+  }
+  
+
+</style>
+
+<style>
+  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+    font-size: 12px;
+  }
+
+  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+    background: #6fb5fa;
+  }
+  .el-autocomplete-suggestion{
+    width: 400px !important;
+  }
+  
+
+</style>

src/xt_pages/stock/testOrderDetail.vue

@@ -0,0 +1,372 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+    </div>
+    <div class="app-container">
+      <el-table
+        :row-style="{ color: '#303133' }"
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266',
+        }"
+        :data="tableList"
+        :class="signAndWeighBoxPatients"
+        border
+      >
+        <el-table-column label="商品名称" align="center">
+          <template slot-scope="scope">
+             {{scope.row.project_name}}
+          </template>
+        </el-table-column>
+        <el-table-column label="商品类型" align="center">
+          <template slot-scope="scope">
+           {{scope.row.project_type}}
+          </template>
+        </el-table-column>
+       
+        <el-table-column label="规格" align="center" width="150">
+          <template slot-scope="scope">
+            {{scope.row.second_specification_name}}
+          </template>
+        </el-table-column>
+        <el-table-column label="调拨数量" align="center">
+          <template slot-scope="scope">
+            {{scope.row.count}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="调出仓库" align="center">
+          <template slot-scope="scope">
+            {{getHouseName(scope.row.storehouse_out_id)}}
+          </template>
+        </el-table-column>
+        <el-table-column label="调入仓库" align="center">
+          <template slot-scope="scope">
+            {{getHouseName(scope.row.storehouse_in_id)}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="库存总数" align="center">
+          <template slot-scope="scope">
+            {{scope.row.second_total}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="制单人" align="center">
+          <template slot-scope="scope">
+            {{getDocName(warehouse.creater)}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="审核人" align="center">
+          <template slot-scope="scope">
+          {{getDocName(warehouse.checker)}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="审核时间" align="center">
+          <template slot-scope="scope">
+           <span v-if="warehouse.check_time >0">{{getTimes(warehouse.check_time)}}</span>  
+          </template>
+        </el-table-column>
+
+      </el-table>
+      
+    </div>
+  </div>
+</template>
+
+<script>
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import {getSecondOrderDetailList} from "@/api/seconde";
+import { uParseTime } from "@/utils/tools";
+export default {
+  name: "stockIn",
+  components: {},
+  components: {
+    BreadCrumb,
+  },
+  data() {
+    return {
+      isActive: false,
+      Color_txt: true,
+      crumbs: [
+        { path: false, name: "采购管理" },
+        { path: "/supply/query", name: "采购订单" },
+      ],
+      keywords: "",
+      total: 0,
+      multipleSelection: [],
+      signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+      start_time: "",
+      end_time: "",
+      page: 1,
+      limit: 10,
+      goodType: [],
+      goodInfo: [],
+      org_id: 0,
+      types: [],
+      tableList: [],
+      type_name: "",
+      checkList: [
+        { id: 0, name: "请选择" },
+        { id: 1, name: "已审核" },
+        { id: 2, name: "未审核" },
+      ],
+      supplyList: [],
+      check_id: 0,
+      doctorList: [],
+      houseList:[],
+      warehouse:{},
+    };
+  },
+  methods: {
+    toAdd() {
+      this.$router.push({ path: "/purchase/order/add" });
+    },
+    getTimes(time) {
+      if (time === "") {
+        return "";
+      }
+      return uParseTime(time, "{y}-{m}-{d}");
+    },
+    getlist() {
+       var id = parseInt(this.$route.query.id)
+      getSecondOrderDetailList(id).then((response) => {
+        if (response.data.state == 1) {
+          var list = response.data.data.list;
+          this.tableList = list;
+          this.houseList = response.data.data.houseList
+          this.doctorList = response.data.data.doctorList
+          var warehouse = response.data.data.warehouse
+          this.warehouse = warehouse
+        }
+      });
+    },
+    getName(id) {
+      var name = "";
+      for (let i = 0; i < this.supplyList.length; i++) {
+        if (id == this.supplyList[i].id) {
+          name = this.supplyList[i].supplier_name;
+        }
+      }
+      return name;
+    },
+    getDocName(id) {
+      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;
+        }
+      }
+      return user_name;
+    },
+    getAllBuyPrice(arr) {
+      var buy_price = 0;
+      if (arr != undefined && arr.length > 0) {
+        for (let i = 0; i < arr.length; i++) {
+          buy_price += arr[i].count * arr[i].price;
+        }
+      }
+      return buy_price.toFixed(2);
+    },
+    getAllCount(arr) {
+      var count = 0;
+      if (arr != undefined && arr.length > 0) {
+        for (let i = 0; i < arr.length; i++) {
+          count += parseInt(arr[i].count);
+        }
+      }
+      if (count == 0) {
+        return "";
+      }
+      if (count > 0) {
+        return count;
+      }
+    },
+    toClick(id) {
+      window.sessionStorage.setItem('purchase_start_time',this.start_time)
+      window.sessionStorage.setItem('purchase_end_time',this.end_time)
+      this.$router.push({ path: "/stock/in/test/edit?id=" + id });
+    },
+    toDetail(id){
+      this.$router.push({ path: "/stock/in/test/detail?id=" + id });
+    },
+    toDelete(val, index) {
+      if (val.is_check == 1) {
+        this.$message.error("已审核单据，不能删除!");
+        return false;
+      }
+      if (val.orderOut.length > 0) {
+        this.$message.error("已关联单据，不能删除!");
+        return false;
+      }
+      this.$confirm("确认删除吗?", "删除", {
+        confirmButtonText: "确 定",
+        cancelButtonText: "取 消",
+        type: "warning",
+      }).then(() => {
+          deletePurchaseOrder(val.id).then((response) => {
+            if (response.data.state == 1) {
+              var msg = response.data.data.msg;
+              this.tableList.splice(index, 1);
+              this.getlist()
+              this.$message.success("删除成功");
+            } else {
+              this.$message.error("删除失败");
+            }
+          });
+        })
+        .catch(() => {});
+    },
+    // 动态改变表格样式
+    Color_Change() {
+      this.Color_txt = true;
+      console.log(this.Color_txt, "op");
+    },
+
+    Color_Changeleave() {
+      this.Color_txt = false;
+      console.log(this.Color_txt, "false");
+    },
+    getTime(time) {
+      if (time === '') {
+      return ''
+      }
+      return uParseTime(time, '{y}-{m}-{d}')
+     },
+    getHouseName(id){
+      var storehouse_name = ""
+      for(let i=0;i<this.houseList.length;i++){
+         if(id == this.houseList[i].id){
+           storehouse_name = this.houseList[i].storehouse_name
+         }
+      }
+      return storehouse_name
+    },
+   getDocName(id){
+      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
+        }
+      }
+      return user_name
+     },
+  },
+  created() {
+ 
+    var now = new Date(); //当前日期
+    var nowMonth = now.getMonth(); //当前月
+    var nowYear = now.getFullYear(); //当前年
+    //本月的开始时间
+    var monthStartDate = new Date(nowYear, nowMonth, 1);
+    this.start_time = this.getTimes(monthStartDate);
+    this.end_time = this.getTimes(new Date());
+
+    this.org_id = this.$store.getters.xt_user.org_id;
+    var start_time =  window.sessionStorage.getItem('purchase_start_time')
+    
+    var end_time =  window.sessionStorage.getItem('purchase_end_time')
+   
+    if(start_time !=null){
+      this.start_time = ""
+      this.start_time = start_time
+    }
+    if(end_time!=null){
+      this.end_time = ""
+      this.end_time = end_time
+    }
+    window.sessionStorage.removeItem('purchase_start_time')
+    window.sessionStorage.removeItem('purchase_end_time')
+   
+    this.getlist();
+   
+  },
+};
+</script>
+<style lang="scss">
+.cluster-rs {
+  text-align: center;
+}
+.annotation-rs {
+  width: 100%;
+  height: 100%;
+  border: none;
+  td {
+    width: 155px;
+    padding: 5px;
+    border-right: none;
+    text-align: center;
+    vertical-align: middle;
+  }
+}
+tr:last-child {
+  td {
+    border-bottom: none;
+  }
+}
+</style>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+.information {
+  border: 1px #dcdfe6 solid;
+  padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+}
+
+.title {
+  background: #409eff;
+  height: 44px;
+  line-height: 44px;
+  padding: 0 0 0 10px;
+  color: #fff;
+  margin: 0 0 10px 0;
+}
+
+.edit_separater {
+  border-top: 1px solid rgb(233, 233, 233);
+  margin-top: 15px;
+  margin-bottom: 15px;
+}
+/deep/ .el-table__body-wrapper::-webkit-scrollbar {
+  width: 10px;
+  height: 10px;
+}
+</style>
+
+<style>
+.sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+  font-size: 12px;
+}
+
+.sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+  background: #6fb5fa;
+}
+
+.count {
+  color: #bd2c00;
+}
+.el-table td,
+.el-table th.is-leaf,
+.el-table--border,
+.el-table--group {
+  border-color: #d0d3da;
+}
+.el-table--border::after,
+.el-table--group::after,
+.el-table::before {
+  background-color: #d0d3da;
+}
+
+.color {
+  background: none !important;
+  display: flex;
+  flex-direction: column;
+}
+</style>

src/xt_pages/stock/testOrderEdit.vue

@@ -0,0 +1,556 @@
+<template>
+
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb  :crumbs='crumbs'></bread-crumb>
+     
+      <div style="float:right;">
+        <el-button size="small" @click="back()" class="filter-item">取 消</el-button>
+        <el-button size="small" type="primary" @click="submit()" class="filter-item">保 存</el-button>
+      </div>
+    </div>
+    <div class="app-container" v-loading="loading">
+
+      <div class="cell clearfix">
+      
+        <label class="title"><span class="name">入库时间</span> : </label>
+        <el-date-picker size="small" v-model="warehousing_time" prefix-icon="el-icon-date" :editable="false"
+                        style="width: 196px;" type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd"></el-date-picker>
+       <label class="title"><span class="name">调入仓库</span> : </label>
+        <el-select size="small" v-model="storehouse_in_id" filterable placeholder="请选择仓库">
+          <el-option
+            v-for="(option, index) in houseList"
+            :key="index"
+            :label="option.storehouse_name"
+            :value="option.id">
+          </el-option>
+        </el-select>
+
+        <label class="title"><span class="name">调出仓库</span> : </label>
+        <el-select size="small" v-model="storehouse_out_id" filterable placeholder="请选择仓库">
+          <el-option
+            v-for="(option, index) in houseList"
+            :key="index"
+            :label="option.storehouse_name"
+            :value="option.id">
+          </el-option>
+        </el-select>
+      </div>
+
+    
+      <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
+        <el-table id="oictable" :data="recordInfo.recordData" :class="signAndWeighBoxPatients" border
+                  style="width: 100%"
+                  max-height="450" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+        >
+          <el-table-column align="center" width="200" fixed="left">
+             <template slot="header" slot-scope="scope">
+              <span>商品名称</span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item
+                :prop="'tableList.' + scope.$index + '.name'"
+                :rules="tableRules.name"
+              >
+                <el-select
+                  v-model="scope.row.name"
+                  style="width: 160"
+                  filterable
+                  placeholder="请选择商品"
+                  @change="changeName"
+                  @input="changeGoodName(scope.$index)"
+                  :disabled="disabled"
+                >
+                  <el-option
+                    v-for="(item, index) in tabList"
+                    :key="index"
+                    :label="item.project_name"
+                    :value="item"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" width="200">
+            
+            <template slot="header" slot-scope="scope">
+              <span>商品类型<span style="color: red">*</span></span>
+            </template>
+     
+            <template slot-scope="scope">
+              <el-form-item style="padding-top: 20px;">
+                <el-input v-model="scope.row.project_type" :disabled="true" style="width:180px"></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" width="300">
+            
+            <template slot="header" slot-scope="scope">
+              <span>规格<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+
+              <el-form-item style="padding-top: 20px">
+                 <el-input v-model="scope.row.second_specification_name" style="width:200px" :disabled="true"></el-input>
+              </el-form-item>
+
+            </template>
+          </el-table-column>
+        
+          <el-table-column align="center" width="250">
+            <template slot="header" slot-scope="scope">
+              <span>调拨数量<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item style="padding-top: 20px" :prop="'recordData.' + scope.$index + '.number'"
+                            :rules='tableRules.number' >
+                <el-input v-model="scope.row.count" style="width:100px"></el-input>
+                <el-select
+                  v-model="scope.row.sencond_unit"
+                  style="width: 100px"
+                  filterable
+                  placeholder="请选择"
+                  :disabled="disabled"
+                >
+                  <el-option
+                    v-for="(item, index) in scope.row.unitList"
+                    :key="index"
+                    :label="item.name"
+                    :value="item.name"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </template>
+          </el-table-column>
+
+
+    
+          <el-table-column align="center" width="220">
+            <template slot="header" slot-scope="scope">
+              <span>库存总数<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+            
+              <el-form-item :prop="'recordData.' + scope.$index + '.packing_price'" :rules='tableRules.packing_price'
+                            style="padding-top: 20px">
+                <el-input v-model="scope.row.second_total" style="width:200px"></el-input>
+              </el-form-item>
+
+
+            </template>
+          </el-table-column>
+      
+          <el-table-column label="备注" align="center" width="300">
+            <template slot-scope="scope">
+               <el-input v-model="scope.row.remake" style="width:200px"></el-input>
+            </template>
+          </el-table-column>
+          
+          <el-table-column label="操作" align="center" fixed="right" width="150">
+            <template slot-scope="scope">
+              <el-tooltip class="item" effect="dark" content="新增" placement="top">
+                <el-button
+                  size="mini"
+                  type="primary"
+                  icon="el-icon-circle-plus-outline"
+                  @click="handleEdit(scope.$index, scope.row)">
+                </el-button>
+              </el-tooltip>
+              <el-tooltip class="item" effect="dark" content="删除" placement="top">
+
+                <el-button
+                  size="mini"
+                  type="danger"
+                  icon="el-icon-delete"
+                  @click="handleDelete(scope.$index, scope.row)">
+                </el-button>
+              </el-tooltip>
+
+            </template>
+          </el-table-column>
+
+        </el-table>
+      </el-form>
+
+
+    </div>
+  </div>
+
+</template>
+
+<script>
+  import { uParseTime } from '@/utils/tools'
+  import {getSencondeGoodList,updateSencondOrder,getSencondOrderDetail} from '@/api/seconde'
+  import BreadCrumb from '../components/bread-crumb'
+
+  export default {
+    components: { BreadCrumb },
+    name: 'stockIn',
+
+    data() {
+     
+      return {
+        crumbs: [
+          { path: false, name: '库存管理' },
+          { path: false, name: '耗材入库单' },
+          { path: false, name: '新增入库单' }
+        ],
+        crumbs2: [
+          { path: false, name: '库存管理' },
+          { path: false, name: '其他入库单' },
+          { path: false, name: '新增入库单' }
+        ],
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        warehousing_time: '',
+        adminUserOptions: null,
+        currentIndex: 0,
+        tableRules: {
+          price: [
+            { required: true, message: '单价不能为空', trigger: 'blur' }
+          ],
+        },
+        goodType: [],
+        manufacturerList:[],
+        goodList:[],
+        loading:false,
+        list:[],
+        configlist:{},
+        recordInfo: {
+          recordData: [],
+        },
+        drugList:[],
+        goodTypeList:[],
+        drugTypeList:[],
+        houseList:[],
+        tabList:[],
+        disabled:false,
+        storehouse_out_id:"",
+        storehouse_in_id:"",
+      }
+    },
+    methods: {
+      handleEdit: function(index, row) {
+        const tempObj = {}
+        tempObj["id"] = 0
+        tempObj["name"] = "";
+        tempObj['project_name'] = ""
+        tempObj['project_type'] = ""
+        tempObj['second_specification_name'] = ''
+        tempObj['sencond_unit'] = ''
+        tempObj['count'] = ''
+        tempObj['second_total'] = ''
+        tempObj["is_source"] = 0
+        tempObj["remake"] = ''
+        tempObj["project_id"] = 0
+        tempObj["min_price"] = 0
+        this.recordInfo.recordData.push(tempObj)
+      }, 
+      handleDelete: function(index, row) {
+        if (this.recordInfo.recordData.length <= 1) {
+          this.$message.error('只有一条记录的时候无法删除')
+          return
+        } else {
+          this.recordInfo.recordData.splice(index, 1)
+        }
+      }, calculate: function(val) {
+        if (val == 0) {
+          return ''
+        }
+        return Math.round(parseFloat(val) * 100) / 100
+      }, 
+    getTime(val, temp) {
+        if (val != 0) {
+          return uParseTime(val, temp)
+        } else {
+          return ''
+        }
+      },
+      submit() {
+       
+        this.$refs['tableForm'].validate((valid) => {
+          if (valid) {
+            this.loading = true
+            const array = this.recordInfo.recordData
+            if(this.storehouse_in_id <=0){
+              this.$message.error("调入仓库不能为空!")
+              return
+            }
+            if(this.storehouse_out_id <=0){
+              this.$message.error("调出仓库不能为空!")
+              return
+            }
+            for (let i = 0; i < array.length; i++) {
+              array[i].count = parseInt(array[i].count)
+              array[i].second_total = array[i].second_total.toString()
+            }
+
+            const loading = this.$loading({
+              lock: true,
+              text: 'Loading',
+              spinner: 'el-icon-loading',
+              background: 'rgba(0, 0, 0, 0.7)'
+            })
+            const params = {
+              'stockIn': this.recordInfo.recordData
+            }
+            var storehouse_in_id = parseInt(this.storehouse_in_id)
+            var storehouse_out_id = parseInt(this.storehouse_out_id)
+            var id = parseInt(this.$route.query.id)
+            updateSencondOrder(params, this.warehousing_time,storehouse_in_id,storehouse_out_id,id).then(response => {
+              if (response.data.state == 1) {
+                var warehousingInfo = response.data.data.warehousingInfo   
+                this.$message.success('保存成功')
+                this.loading = false 
+                loading.close()
+              } else {
+                this.$message.error("保存失败")
+                loading.close()
+              }
+            })
+          } else {
+            return false
+          }
+        })
+      },
+      changeGoodName(val){
+        this.currentIndex = val
+      },
+      //获取基本数据信息
+      getlist(){
+       getSencondeGoodList().then(response=>{
+         if(response.data.state == 1){
+            var drugList = response.data.data.drugList
+            this.drugList= drugList
+            var goodList = response.data.data.goodList
+            this.goodList = goodList
+            var manufactuerList = response.data.data.manufactuerList
+            var goodTypeList = response.data.data.goodTypeList
+            this.goodTypeList = goodTypeList
+            var drugTypeList = response.data.data.drugTypeList
+            this.drugTypeList = drugTypeList
+            var houseList =  response.data.data.houseList
+            this.houseList = houseList
+
+            for(let i=0;i<drugList.length;i++){
+              for (let z = 0; z < drugList[i].drug_warehouse_info.length; z++) {
+                if (drugList[i].max_unit ==drugList[i].drug_warehouse_info[z].max_unit) {
+                    drugList[i].drug_warehouse_info[z].stock_max_number = drugList[i].drug_warehouse_info[z].stock_max_number *drugList[i].min_number;
+                }
+               }
+               for (let y = 0; y < this.drugTypeList.length; y++) {
+                  if (drugList[i].drug_type == this.drugTypeList[y].value) {
+                     drugList[i].drug_type = this.drugTypeList[y].name;
+                   }
+                }
+                drugList[i].name =drugList[i].drug_name + " " +drugList[i].dose + drugList[i].dose_unit + "*" +drugList[i].min_number +drugList[i].min_unit + "/" + drugList[i].max_unit + " " +drugList[i].manufacturer;
+                drugList[i].project_name =drugList[i].drug_name + " " +drugList[i].dose + drugList[i].dose_unit + "*" +drugList[i].min_number +drugList[i].min_unit + "/" + drugList[i].max_unit + " " +drugList[i].manufacturer;
+                drugList[i].project_type = drugList[i].drug_type;
+                drugList[i].second_specification_name = drugList[i].dose + drugList[i].dose_unit +"*" + drugList[i].min_number +drugList[i].min_unit +"/" + drugList[i].max_unit;
+                drugList[i].second_total = this.getWarehoseInfo(drugList[i].drug_warehouse_info,drugList[i].max_unit,drugList[i].min_unit,drugList[i].min_number);
+                drugList[i].is_source = 1
+                drugList[i].count = ""
+                drugList[i].remake = ""
+                drugList[i].min_price = drugList[i].min_price
+             if (drugList[i].max_unit != drugList[i].min_unit) {
+                drugList[i].unitList = [
+                    { id: 1, name: "" },
+                    { id: 2, name: "" },
+                ];
+             }
+            if (drugList[i].max_unit == drugList[i].min_unit) {
+               drugList[i].unitList = [{ id: 1, name: "" }];
+            }
+
+            drugList[i].sencond_unit = drugList[i].max_unit;
+            for (let j = 0; j < drugList[i].unitList.length; j++) {
+              if (drugList[i].max_unit != drugList[i].min_unit) {
+                drugList[i].unitList[0].name = drugList[i].max_unit;
+                drugList[i].unitList[1].name = drugList[i].min_unit;
+              }
+              if (drugList[i].max_unit == drugList[i].min_unit) {
+                drugList[i].unitList[0].name = drugList[i].max_unit;
+              }
+            }
+            this.tabList.push(drugList[i]);
+            }
+
+           for (let i = 0; i < goodList.length; i++) {
+            for (let y = 0; y < this.goodTypeList.length; y++) {
+              if (goodList[i].good_type_id == this.goodTypeList[y].id) {
+                goodList[i].good_type_id = this.goodTypeList[y].type_name;
+              }
+            }
+            goodList[i].project_name = goodList[i].good_name + " " + goodList[i].specification_name + " " + goodList[i].manufacturer;
+            goodList[i].project_type = goodList[i].good_type_id;
+            goodList[i].second_specification_name = goodList[i].specification_name;
+            goodList[i].second_total = this.getTotalStockCount(
+              goodList[i].good_warehouse_info
+            );
+            goodList[i].count = ""
+            goodList[i].is_source = 2;
+            goodList[i].name = goodList[i].good_name;
+            goodList[i].unitList = [{ id: 1, name: "" }];
+            goodList[i].sencond_unit = goodList[i].packing_unit;
+            goodList[i].remake = ""
+            goodList[i].min_price = goodList[i].retail_price
+            for (let j = 0; j < goodList[i].unitList.length; j++) {
+              goodList[i].unitList[0].name = goodList[i].packing_unit;
+            }
+            this.tabList.push(goodList[i]);
+          }
+            
+         }
+       })
+      },
+      
+      getWarehoseInfo(arr, max_unit, min_unit, min_number) {
+        var total = 0;
+        var max_str = "";
+        var min_str = "";
+        if (arr.length > 0) {
+            for (let i = 0; i < arr.length; i++) {
+            total += parseInt(arr[i].stock_max_number + arr[i].stock_min_number);
+            }
+        }
+        if (total < min_number) {
+            min_str = total + min_unit;
+        }
+        if (total == 0) {
+            min_str = "";
+            max_str = "";
+        }
+        if (total >= min_number) {
+            if (parseInt(total / min_number) != 0) {
+            max_str = parseInt(total / min_number) + max_unit;
+            }
+            if (total % min_number != 0) {
+            min_str = (total % min_number) + min_unit;
+            }
+        }
+        return max_str + min_str;
+      },
+      getTotalStockCount(arr) {
+        var total_count = 0;
+        for (let i = 0; i < arr.length; i++) {
+            total_count += arr[i].stock_count;
+        }
+        return total_count;
+      },
+     changeGoodName(val) {
+      this.currentIndex = val;
+    },
+    changeName(val) {
+      for (let i = 0; i < this.recordInfo.recordData.length; i++) {
+        if (this.currentIndex == i) {
+          this.recordInfo.recordData[i].project_id = val.id;
+          this.recordInfo.recordData[i].is_source = val.is_source;
+          this.recordInfo.recordData[i].name = val.name;
+          this.recordInfo.recordData[i].project_name = val.project_name;
+          this.recordInfo.recordData[i].project_type = val.project_type;
+          this.recordInfo.recordData[i].second_specification_name = val.second_specification_name;
+          this.recordInfo.recordData[i].second_total = val.second_total;
+          this.recordInfo.recordData[i].sencond_unit = val.sencond_unit
+          this.recordInfo.recordData[i].min_price = val.min_price
+          if (val.count == NaN) {
+            this.recordInfo.recordData[i].count = "";
+          } else {
+            this.recordInfo.recordData[i].count = val.count? val.count : "";
+          }
+          this.recordInfo.recordData[i].unitList = val.unitList;
+        }
+      }
+    },
+    getSencondOrderDetail(){
+       var id = parseInt(this.$route.query.id)
+      getSencondOrderDetail(id).then(response=>{
+         if(response.data.state == 1){
+           var warehouse = response.data.data.warehouse
+           this.storehouse_in_id = warehouse.storehouse_in_id
+           this.storehouse_out_id = warehouse.storehouse_out_id
+           var list = response.data.data.list
+           for(let i=0;i<list.length;i++){
+              list[i].id = list[i].id
+              list[i].name = list[i].project_name
+           }
+           this.recordInfo.recordData = list
+           console.log("list23233223323232322323",list)
+         }
+      })   
+    }
+    },
+    created() {
+      var nowDate = new Date()
+      var nowYear = nowDate.getFullYear()
+      var nowMonth = nowDate.getMonth() + 1
+      var nowDay = nowDate.getDate()
+      this.warehousing_time =
+        nowYear +
+        '-' +
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+        '-' +
+        (nowDay < 10 ? '0' + nowDay : nowDay)
+      const tempObj = {}
+      tempObj["name"] = "";
+      tempObj['project_name'] = ""
+      tempObj['project_type'] = ""
+      tempObj['second_specification_name'] = ''
+      tempObj['sencond_unit'] = ''
+      tempObj['count'] = ''
+      tempObj['second_total'] = ''
+      tempObj["remake"] = ''
+      tempObj["is_source"] = 0
+      tempObj["project_id"] = 0
+      tempObj["min_price"] = 0
+      tempObj["id"] = 0
+      this.recordInfo.recordData.push(tempObj)
+      this.getlist()
+      this.getSencondOrderDetail()
+    }
+
+  }
+</script>
+
+<style>
+  #oictable ::-webkit-scrollbar {
+    height: 15px;
+  }
+</style>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+
+  }
+
+  .edit_separater {
+    border-top: 1px solid rgb(233, 233, 233);
+    margin-top: 15px;
+    margin-bottom: 15px;
+  }
+  
+
+</style>
+
+<style>
+  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+    font-size: 12px;
+  }
+
+  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+    background: #6fb5fa;
+  }
+  .el-autocomplete-suggestion{
+    width: 400px !important;
+  }
+  
+
+</style>

src/xt_pages/stock/testOrderQuery.vue

@@ -0,0 +1,494 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+    </div>
+    <div class="app-container">
+      <div
+        style="
+          justify-content: space-between;
+          margin: 0px 0 12px 0;
+          display: flex;
+          align-items: center;
+        "
+      >
+        <div>
+          <el-date-picker
+            size="small"
+            v-model="start_time"
+            prefix-icon="el-icon-date"
+            :editable="false"
+            style="width: 196px"
+            type="date"
+            placeholder="选择日期时间"
+            align="right"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            @change="startTimeChange"
+          ></el-date-picker
+          >-
+          <el-date-picker
+            size="small"
+            v-model="end_time"
+            prefix-icon="el-icon-date"
+            :editable="false"
+            style="width: 196px"
+            type="date"
+            placeholder="选择日期时间"
+            align="right"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            @change="endTimeChange"
+          ></el-date-picker>
+          <span>审核状态:</span>
+          <el-select
+            v-model="check_id"
+            style="width: 140px; margin-right: 10px"
+            placeholder="请选择"
+            @change="changeTypeName"
+          >
+            <el-option
+              v-for="item in checkList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+          <el-input
+            size="small"
+            style="width: 200px; margin-left: 10px"
+            class="filter-item"
+            v-model.trim="keywords"
+            placeholder="单据编号，仓库名称"
+          />
+          <el-button
+            size="small"
+            class="filter-item"
+            type="primary"
+            icon="el-icon-search"
+            @click="search"
+            >搜索</el-button
+          >
+        </div>
+        <div>
+          <el-button size="small" type="primary" @click="toAdd">新增</el-button>
+        </div>
+      </div>
+
+      <el-table
+        :row-style="{ color: '#303133' }"
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266',
+        }"
+        :data="tableList"
+        :class="signAndWeighBoxPatients"
+        border
+      >
+        <el-table-column label="单据编号" align="center">
+          <template slot-scope="scope">
+            {{scope.row.second_order_number}}
+          </template>
+        </el-table-column>
+        <el-table-column label="单据日期" align="center">
+          <template slot-scope="scope">
+            {{getTime(scope.row.record_date)}}
+          </template>
+        </el-table-column>
+       
+        <el-table-column label="调出仓库" align="center" width="150">
+          <template slot-scope="scope">
+            {{getHouseName(scope.row.storehouse_out_id)}}
+          </template>
+        </el-table-column>
+        <el-table-column label="调入仓库" align="center">
+          <template slot-scope="scope">
+            {{getHouseName(scope.row.storehouse_in_id)}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="制单人" align="center">
+          <template slot-scope="scope">
+            {{getDocName(scope.row.creater)}}
+          </template>
+        </el-table-column>
+        <el-table-column label="审核人" align="center">
+          <template slot-scope="scope">
+           {{getDocName(scope.row.checker)}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="审核时间" align="center">
+          <template slot-scope="scope">
+          {{getTime(scope.row.checker)}}
+          </template>
+        </el-table-column>
+
+    
+        <el-table-column label="操作" align="center" width="300px">
+          <template slot-scope="scope">
+            <el-button
+              icon="el-icon-edit-outline"
+              size="small"
+              type="primary"
+              @click="toClick(scope.row.id)"
+              >编辑
+            </el-button>
+             <el-button
+              icon="el-icon-edit-outline"
+              size="small"
+              type="primary"
+              @click="toDetail(scope.row.id)"
+              >详情
+            </el-button>
+            <el-button
+              icon="el-icon-delete"
+              size="small"
+              type="danger"
+              @click="toDelete(scope.row, scope.$index)"
+              >删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[10, 50, 100, 200, 500, 1000]"
+        :page-size="10"
+        background
+        align="right"
+        style="margin-top: 20px"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      >
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
+
+import {
+  getAllSecondOrderList
+} from "@/api/seconde";
+import { uParseTime } from "@/utils/tools";
+export default {
+  name: "stockIn",
+  components: {},
+  components: {
+    BreadCrumb,
+  },
+  data() {
+    return {
+      isActive: false,
+      Color_txt: true,
+      crumbs: [
+        { path: false, name: "采购管理" },
+        { path: "/supply/query", name: "采购订单" },
+      ],
+      keywords: "",
+      total: 0,
+      multipleSelection: [],
+      signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+      start_time: "",
+      end_time: "",
+      page: 1,
+      limit: 10,
+      goodType: [],
+      goodInfo: [],
+      org_id: 0,
+      types: [],
+      tableList: [{}],
+      type_name: "",
+      checkList: [
+        { id: 0, name: "请选择" },
+        { id: 1, name: "已审核" },
+        { id: 2, name: "未审核" },
+      ],
+      supplyList: [],
+      check_id: 0,
+      doctorList: [],
+      houseList:[],
+    };
+  },
+  methods: {
+    toAdd() {
+      this.$router.push({ path: "/purchase/order/add" });
+    },
+    changeTypeName() {
+      this.getlist();
+    },
+    startTimeChange() {
+      this.getlist();
+    },
+    endTimeChange() {
+      this.getlist();
+    },
+    search() {
+      this.getlist();
+    },
+    handleSizeChange(val) {
+      this.limit = val;
+      this.getlist();
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.getlist();
+    },
+    getTimes(time) {
+      if (time === "") {
+        return "";
+      }
+      return uParseTime(time, "{y}-{m}-{d}");
+    },
+    getlist() {
+      var params = {
+        check_id: this.check_id,
+        start_time: this.start_time,
+        end_time: this.end_time,
+        keyword: this.keywords,
+        page: this.page,
+        limit: this.limit,
+      };
+      console.log("params2332232332", params);
+      getAllSecondOrderList(params).then((response) => {
+        if (response.data.state == 1) {
+          var list = response.data.data.list;
+          console.log("list2323322332323232232323",list)
+          this.tableList = list;
+          var total = response.data.data.total;
+          this.total = total;
+          this.houseList = response.data.data.houseList
+          this.doctorList = response.data.data.doctorList
+        }
+      });
+    },
+    getName(id) {
+      var name = "";
+      for (let i = 0; i < this.supplyList.length; i++) {
+        if (id == this.supplyList[i].id) {
+          name = this.supplyList[i].supplier_name;
+        }
+      }
+      return name;
+    },
+    getDocName(id) {
+      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;
+        }
+      }
+      return user_name;
+    },
+    getAllBuyPrice(arr) {
+      var buy_price = 0;
+      if (arr != undefined && arr.length > 0) {
+        for (let i = 0; i < arr.length; i++) {
+          buy_price += arr[i].count * arr[i].price;
+        }
+      }
+      return buy_price.toFixed(2);
+    },
+    getAllCount(arr) {
+      var count = 0;
+      if (arr != undefined && arr.length > 0) {
+        for (let i = 0; i < arr.length; i++) {
+          count += parseInt(arr[i].count);
+        }
+      }
+      if (count == 0) {
+        return "";
+      }
+      if (count > 0) {
+        return count;
+      }
+    },
+    toClick(id) {
+      window.sessionStorage.setItem('purchase_start_time',this.start_time)
+      window.sessionStorage.setItem('purchase_end_time',this.end_time)
+      this.$router.push({ path: "/stock/in/test/edit?id=" + id });
+    },
+    toDetail(id){
+      this.$router.push({ path: "/stock/in/test/detail?id=" + id });
+    },
+    toDelete(val, index) {
+      if (val.is_check == 1) {
+        this.$message.error("已审核单据，不能删除!");
+        return false;
+      }
+      if (val.orderOut.length > 0) {
+        this.$message.error("已关联单据，不能删除!");
+        return false;
+      }
+      this.$confirm("确认删除吗?", "删除", {
+        confirmButtonText: "确 定",
+        cancelButtonText: "取 消",
+        type: "warning",
+      }) .then(() => {
+          deletePurchaseOrder(val.id).then((response) => {
+            if (response.data.state == 1) {
+              var msg = response.data.data.msg;
+              this.tableList.splice(index, 1);
+              this.getlist()
+              this.$message.success("删除成功");
+            } else {
+              this.$message.error("删除失败");
+            }
+          });
+        }).catch(() => {});
+    },
+    // 动态改变表格样式
+    Color_Change() {
+      this.Color_txt = true;
+      console.log(this.Color_txt, "op");
+    },
+
+    Color_Changeleave() {
+      this.Color_txt = false;
+      console.log(this.Color_txt, "false");
+    },
+    getTime(time) {
+      if (time === '') {
+      return ''
+      }
+      return uParseTime(time, '{y}-{m}-{d}')
+     },
+    getHouseName(id){
+      var storehouse_name = ""
+      for(let i=0;i<this.houseList.length;i++){
+         if(id == this.houseList[i].id){
+           storehouse_name = this.houseList[i].storehouse_name
+         }
+      }
+      return storehouse_name
+    },
+   getDocName(id){
+      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
+        }
+      }
+      return user_name
+     },
+  },
+  created() {
+ 
+    var now = new Date(); //当前日期
+    var nowMonth = now.getMonth(); //当前月
+    var nowYear = now.getFullYear(); //当前年
+    //本月的开始时间
+    var monthStartDate = new Date(nowYear, nowMonth, 1);
+    this.start_time = this.getTimes(monthStartDate);
+    this.end_time = this.getTimes(new Date());
+
+    this.org_id = this.$store.getters.xt_user.org_id;
+    var start_time =  window.sessionStorage.getItem('purchase_start_time')
+    
+    var end_time =  window.sessionStorage.getItem('purchase_end_time')
+   
+    if(start_time !=null){
+      this.start_time = ""
+      this.start_time = start_time
+    }
+    if(end_time!=null){
+      this.end_time = ""
+      this.end_time = end_time
+    }
+    window.sessionStorage.removeItem('purchase_start_time')
+    window.sessionStorage.removeItem('purchase_end_time')
+   
+
+    this.getlist();
+   
+  },
+};
+</script>
+<style lang="scss">
+.cluster-rs {
+  text-align: center;
+}
+.annotation-rs {
+  width: 100%;
+  height: 100%;
+  border: none;
+  td {
+    width: 155px;
+    padding: 5px;
+    border-right: none;
+    text-align: center;
+    vertical-align: middle;
+  }
+}
+tr:last-child {
+  td {
+    border-bottom: none;
+  }
+}
+</style>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+.information {
+  border: 1px #dcdfe6 solid;
+  padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+}
+
+.title {
+  background: #409eff;
+  height: 44px;
+  line-height: 44px;
+  padding: 0 0 0 10px;
+  color: #fff;
+  margin: 0 0 10px 0;
+}
+
+.edit_separater {
+  border-top: 1px solid rgb(233, 233, 233);
+  margin-top: 15px;
+  margin-bottom: 15px;
+}
+/deep/ .el-table__body-wrapper::-webkit-scrollbar {
+  width: 10px;
+  height: 10px;
+}
+</style>
+
+<style>
+.sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+  font-size: 12px;
+}
+
+.sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+  background: #6fb5fa;
+}
+
+.count {
+  color: #bd2c00;
+}
+.el-table td,
+.el-table th.is-leaf,
+.el-table--border,
+.el-table--group {
+  border-color: #d0d3da;
+}
+.el-table--border::after,
+.el-table--group::after,
+.el-table::before {
+  background-color: #d0d3da;
+}
+
+.color {
+  background: none !important;
+  display: flex;
+  flex-direction: column;
+}
+</style>

src/xt_pages/stock/warehouseManage/components/AddWareHouse.vue

@@ -0,0 +1,220 @@
+<template>
+  <el-dialog
+    title="新增仓库信息"
+    :visible.sync="dialogVisible"
+    width="30%"
+    :before-close="closePop"
+  >
+    <div class="main_contain">
+      <el-form
+        :model="ruleForm"
+        :rules="rules"
+        :label-position="labelPosition"
+        ref="ruleForm"
+        label-width="100px"
+        class="demo-ruleForm"
+      >
+        <el-form-item label="仓库编号">
+          <span>{{storehouse_code}}</span>
+        </el-form-item>
+        <el-form-item label="仓库名称" prop="storehouse_name">
+          <el-input v-model="ruleForm.storehouse_name"></el-input>
+        </el-form-item>
+        <el-form-item label="仓库地址" prop="address">
+          <el-input type="textarea" v-model="ruleForm.address"></el-input>
+        </el-form-item>
+        <el-form-item label="状态" prop="status">
+          <el-radio-group v-model="ruleForm.status">
+            <el-radio :label="1" >启用</el-radio>
+            <el-radio :label="0" >禁用</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="仓库管理员" ><!--prop="region">-->
+          admin
+<!--          <el-select v-model="ruleForm.region" placeholder="请选择管理员">-->
+<!--            <el-option label="admin" value="0"></el-option>-->
+<!--          </el-select>-->
+        </el-form-item>
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="closePop">取 消</el-button>
+      <el-button type="primary" @click="submitForm('ruleForm')">保存</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { getcode,addstorehouse,updatestorehouse } from "@/api/warehouse";
+import login from '../../../../mock/login'
+export default {
+  data() {
+    return {
+      show_type: 1,
+      storehouse_id: "",
+      storehouse_code:"coco",
+      dialogVisible: false,
+      labelPosition:'left',
+      ruleForm: {
+        admin_name:"",
+        storehouse_name: "",
+        region: "",
+        date1: "",
+        date2: "",
+        delivery: false,
+        type: [],
+        status: "",
+        address: "",
+      },
+      //表单验证规则
+      rules: {
+        storehouse_name:[{
+          required:true,message:"仓库名称不能为空",trigger: "change"
+        }],
+        address:[{
+          required:true,message:"仓库地址不能为空",trigger: "change"
+        }],
+        // region: [{ required: true, message: "请选择活动区域", trigger: "change" }],
+        type: [{
+            type: "array",
+            required: true,
+            message: "请至少选择一个活动性质",
+            trigger: "change",
+          },],
+        desc: [{ required: true, message: "请填写活动形式", trigger: "blur" }],
+      },
+      type:"",
+      // storehouse:{
+      //   storehouse_code:"",
+      // },
+    };
+  },
+  methods: {
+    show(data, type) {
+      if (type == 1) {
+        this.initstorehouseData();
+        this.show_type = 1;
+        this.title = "新增仓库";
+        this.dialogVisible = true;
+      } else if (type == 2) {
+        console.log("data:::::::::::",data);
+        this.show_type = 2;
+        this.storehouse_id = data.id;
+        this.title = "编辑仓库";
+        this.storehouse_code = data.storehouse_code;
+        this.ruleForm.address = data.storehouse_address;
+        this.ruleForm.status = data.storehouse_status;
+        this.ruleForm.storehouse_name = data.storehouse_name;
+        this.ruleForm.admin_name = data.storehouse_admin_name;
+        console.log("this.ruleForm.admin_name",this.ruleForm.admin_name);
+        this.dialogVisible = true;
+      }
+    },
+    // 获取仓库编码接口
+    initstorehouseData() {
+      getcode().then((res) => {
+        if (res.data.state == 1) {
+          this.storehouse_code =
+            res.data.data.list;
+        }
+      });
+    },
+    //清除表单数据
+    closePop() {
+      console.log("this.ruleForm",this.ruleForm)
+      this.dialogVisible = false;
+      this.ruleForm.storehouse_name = "";
+      this.ruleForm.region = "";
+      this.ruleForm.date1 = "";
+      this.ruleForm.date2 = "";
+      this.ruleForm.type = [];
+      this.ruleForm.status = "";
+      this.ruleForm.address = "";
+    },
+
+
+    //  验证表单内容
+    submitForm(ruleForm) {
+      if (this.show_type == 1) {
+        this.$refs[ruleForm].validate((valid) => {
+          if (valid) {
+            console.log("this.ruleForm.status",this.ruleForm.status);
+            let params = {
+              storehouse_code: this.storehouse_code || "",
+              storehouse_name: this.ruleForm.storehouse_name || "",
+              storehouse_address: this.ruleForm.address || "",
+              storehouse_status:parseInt(this.ruleForm.status)
+              // storehouse_admin_id: this.ruleForm.storehouse_admin_id || "",
+              // storehouse_admin_name: this.ruleForm.storehouse_admin_name || "",
+            };
+            console.log("params::::",params)
+            console.log("status::::",this.ruleForm.status)
+            addstorehouse(params).then((res) => {
+              if (res.data.state == 1) {
+                this.$message.success("新增成功");
+                this.closePop();
+                this.$emit("init");
+              } else {
+                this.$message.error("新增失败：" + res.data.msg);
+                setTimeout(() => {
+                  this.closePop();
+                }, 2000);
+              }
+            });
+          } else {
+            return false;
+          }
+        });
+      } else if (this.show_type == 2) {
+        this.$refs[ruleForm].validate((valid) => {
+          if (valid) {
+            console.log("this.ruleForm.status",this.ruleForm.status);
+            let params = {
+              storehouse_code: this.storehouse_code || "",
+              storehouse_name: this.ruleForm.storehouse_name || "",
+              storehouse_address: this.ruleForm.address || "",
+              storehouse_status:parseInt(this.ruleForm.status),
+              id: this.storehouse_id
+              // storehouse_admin_id: this.ruleForm.storehouse_admin_id || "",
+              // storehouse_admin_name: this.ruleForm.storehouse_admin_name || "",
+            };
+            updatestorehouse(params).then((res) => {
+              if (res.data.state == 1) {
+                this.$message.success("保存成功");
+                this.closePop();
+                this.$emit("init");
+              } else {
+                this.$message.error("保存失败：" + res.data.msg);
+                setTimeout(() => {
+                  this.closePop();
+                }, 2000);
+              }
+            });
+          } else {
+            return false;
+          }
+        });
+      }
+      this.contactsinfo();
+    },
+
+
+
+
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.main_contain {
+  width: 60%;
+  display: flex;
+  flex-direction: column;
+  margin: 0 auto;
+  .main_list {
+    height: 30px;
+    display: flex;
+    line-height: 30px;
+  }
+}
+</style>

src/xt_pages/stock/warehouseManage/query.vue

@@ -0,0 +1,368 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+    </div>
+    <div class="app-container">
+      <div
+        style="
+          justify-content: space-between;
+          margin: 0px 0 12px 0;
+          display: flex;
+          align-items: center;
+        "
+      >
+        <div>
+          <el-input
+            size="small"
+            style="width: 200px; margin-left: 10px"
+            class="filter-item"
+            v-model.trim="keyword"
+            placeholder=""
+          />
+          <el-button
+            size="small"
+            class="filter-item"
+            type="primary"
+            icon="el-icon-search"
+            @click="search"
+            >搜索</el-button
+          >
+        </div>
+        <div>
+          <el-button size="small" type="primary" @click="AddWareHouse(1)">新增</el-button>
+          <el-button size="small" type="primary" @click="toPrint">设置</el-button>
+        </div>
+      </div>
+
+      <el-table
+        :row-style="{ color: '#303133' }"
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266',
+        }"
+        :data="tableData"
+        :class="signAndWeighBoxPatients"
+        border
+      >
+        <el-table-column label="仓库编号" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.storehouse_code ? scope.row.storehouse_code : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="仓库名称" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.storehouse_name ? scope.row.storehouse_name : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="仓库地址" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.storehouse_address ? scope.row.storehouse_address : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="仓库管理员" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.storehouse_admin_name ? scope.row.storehouse_admin_name : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="状态" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.storehouse_status == 1">启用</span>
+            <span v-if="scope.row.storehouse_status == 0">禁用</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="操作" align="center" width="260px">
+          <template slot-scope="scope">
+            <el-tooltip class="item" content="编辑" placement="top-start">
+              <el-button
+                icon="el-icon-edit-outline"
+                size="small"
+                type="primary"
+                @click="toEdit(scope.row,2)"
+              >
+              </el-button>
+            </el-tooltip>
+
+            <el-tooltip class="item" content="禁用" placement="top-start">
+              <el-button
+                size="small"
+                type="danger"
+                @click="toDisable(scope.row, scope.row.$index)"
+                ><img
+                  src="../../../assets/purchase/ban.png"
+                  alt=""
+                  style="width: 12px"
+                />
+              </el-button>
+            </el-tooltip>
+
+            <el-tooltip class="item" content="删除" placement="top-start">
+              <el-button
+                icon="el-icon-delete"
+                size="small"
+                type="danger"
+                @click="toDelete(scope.row, scope.row.$index)"
+              >
+              </el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[10, 50, 100, 200, 500, 1000]"
+        :page-size="10"
+        background
+        align="right"
+        style="margin-top: 20px"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      >
+      </el-pagination>
+    </div>
+
+    <AddWareHouse ref="AddWareHouse" @init="initData" ></AddWareHouse>
+  </div>
+</template>
+
+<script>
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import { getDictionaryDataConfig, getDataConfig } from "@/utils/data";
+import { storehouselist,updatestatus,deletestorehouse } from "@/api/warehouse";
+import AddWareHouse from "./components/AddWareHouse.vue";
+export default {
+  name: "stockIn",
+  created() {
+    var types = getDictionaryDataConfig("system", "drug_type");
+    console.log("44444", types);
+    var arr = [];
+    var obj = { id: 0, name: "全部" };
+    arr.push(obj);
+    arr.push(...types);
+    this.drugType = arr;
+    console.log("arrr", arr);
+    this.getlist();
+  },
+  components: {
+    BreadCrumb,
+    AddWareHouse,
+  },
+  data() {
+    return {
+      crumbs: [
+        { path: false, name: "库房管理" },
+        { path: "/stock/warehousequery", name: "仓库管理" },
+      ],
+      keyword: "",
+      total: 0,
+      multipleSelection: [],
+      signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+      page: 1,
+      limit: 10,
+      tableData: [],
+      drugType: [],
+      stockOutData: [],
+    };
+  },
+  methods: {
+    initData() {
+      let params = {
+        limit: this.limit,
+        page: this.page,
+        keyword:this.keyword,
+      };
+      //请求分页接口
+      storehouselist(params).then((response) => {
+        if (response.data.state == 1) {
+          this.tableData = response.data.data.list;
+          this.total = response.data.data.total;
+        }
+      });
+    },
+
+    getlist() {
+      var params = {
+        keyword: this.keyword,
+        page: this.page,
+        limit: this.limit,
+      };
+      console.log("params", params);
+      //请求分页接口
+      storehouselist(params).then((response) => {
+        if (response.data.state == 1) {
+          this.tableData = response.data.data.list;
+          this.total = response.data.data.total;
+        }
+      });
+    },
+    handleSizeChange(val) {
+      this.limit = val;
+      this.getlist();
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.getlist();
+    },
+
+    startTimeChange: function (val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
+
+      if (time > 0) {
+        this.$message.error("开始时间不能大于结束时间");
+        this.start_time = "";
+      } else {
+        this.getlist();
+      }
+    },
+    endTimeChange: function (val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.end_time = "";
+      } else {
+        this.getlist();
+      }
+    },
+
+    search: function () {
+      this.getlist();
+    },
+    // 新增仓库
+    AddWareHouse(val) {
+      this.$refs.AddWareHouse.show(1, val);
+    },
+    // 编辑仓库
+    toEdit(data,val) {
+      console.log("data is :",data)
+      this.$refs.AddWareHouse.show(data,val);
+    },
+    // 禁用仓库
+    toDisable(val, index) {
+      var params = {
+        id:val.id,
+      };
+      this.$confirm("是否确定将此仓库禁用?", "禁用仓库信息", {
+        confirmButtonText: "确 定",
+        cancelButtonText: "取 消",
+        type: "warning",
+      }).then(() => {
+        updatestatus(params).then((res) => {
+          if (res.data.state == 1) {
+            this.$message.success(res.data.data.list);
+          }else {
+            this.$message.error(res.data.msg);
+          }
+        })//刷新
+        .then(() =>{
+          this.initData();
+        })
+        .catch((err) => {
+          console.log(err)
+        })
+        }).catch(() => {});
+    },
+    //删除仓库
+    toDelete(val, index) {
+      var params = {
+        id:val.id,
+      };
+      this.$confirm("是否确定将此仓库删除?", "删除仓库信息", {
+        confirmButtonText: "确 定",
+        cancelButtonText: "取 消",
+        type: "warning",
+      }).then(() => {
+        deletestorehouse(params).then((res) => {
+          if (res.data.state == 1) {
+            this.$message.success(res.data.data.list);
+          }else {
+            this.$message.error(res.data.msg);
+          }
+        })//刷新
+          .then(() =>{
+            this.initData();
+          })
+          .catch((err) => {
+            console.log(err)
+          })
+      }).catch(() => {});
+    },
+
+    formatJson(filterVal, jsonData) {
+      return jsonData.map((v) => filterVal.map((j) => v[j]));
+    },
+    changeTypeName() {
+      this.getlist();
+    },
+
+    //路由跳转 ----- 仓库设置
+    toPrint() {
+      this.$router.push({ path: "/stock/waresetting" });
+    },
+
+    getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
+    },
+    getDictionaryDataConfig(module, filed_name) {
+      return getDictionaryDataConfig(module, filed_name);
+    },
+    getDataConfig(module, filed_name) {
+      return getDataConfig(module, filed_name);
+    },
+  },
+};
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+.information {
+  border: 1px #dcdfe6 solid;
+  padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+}
+
+.title {
+  background: #409eff;
+  height: 44px;
+  line-height: 44px;
+  padding: 0 0 0 10px;
+  color: #fff;
+  margin: 0 0 10px 0;
+}
+
+.edit_separater {
+  border-top: 1px solid rgb(233, 233, 233);
+  margin-top: 15px;
+  margin-bottom: 15px;
+}
+</style>
+
+<style>
+.sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+  font-size: 12px;
+}
+
+.sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+  background: #6fb5fa;
+}
+
+.count {
+  color: #bd2c00;
+}
+.el-table td,
+.el-table th.is-leaf,
+.el-table--border,
+.el-table--group {
+  border-color: #d0d3da;
+}
+.el-table--border::after,
+.el-table--group::after,
+.el-table::before {
+  background-color: #d0d3da;
+}
+</style>

src/xt_pages/stock/warehouseManage/waresetting.vue

@@ -0,0 +1,198 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+
+      <el-button type="primary" @click="returnTo">返回</el-button>
+    </div>
+    <div class="app-container">
+      <div class="set-contanin">
+        <div class="select-list">
+          <div style="line-height: 36px; white-space: nowrap">
+            请选择耗材自动入库仓库：
+          </div>
+          <el-select v-model="h1" placeholder="请选择" @select="handleSelect1" @change="updateconfig1(h1)" >
+            <el-option
+              v-for="item in options"
+              :key="item.storehouse_name"
+              :label="item.storehouse_name"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+        </div>
+        <div class="select-list">
+          <div style="line-height: 36px; white-space: nowrap">
+            请选择耗材自动出库仓库：
+          </div>
+          <el-select v-model="h2" placeholder="请选择" @select="handleSelect2" @change="updateconfig2(h2)">
+            <el-option
+              v-for="item in options"
+              :key="item.storehouse_name"
+              :label="item.storehouse_name"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+        </div>
+        <div class="select-list">
+          <div style="line-height: 36px; white-space: nowrap">
+            请选择药品自动入库仓库：
+          </div>
+          <el-select v-model="h3" placeholder="请选择" @select="handleSelect3" @change="updateconfig3(h3)">
+            <el-option
+              v-for="item in options"
+              :key="item.storehouse_name"
+              :label="item.storehouse_name"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+        </div>
+        <div class="select-list">
+          <div style="line-height: 36px; white-space: nowrap">
+            请选择药品自动出库仓库：
+          </div>
+          <el-select v-model="h4" placeholder="请选择" @select="handleSelect4" @change="updateconfig4(h4)">
+            <el-option
+              v-for="item in options"
+              :key="item.storehouse_name"
+              :label="item.storehouse_name"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import { getallstorehousename,findstorehouseconfig,updateinfo,updateoutinfo,updatedruginfo,updatedrugout } from "@/api/warehouse";
+export default {
+  components: {
+    BreadCrumb,
+  },
+  data() {
+    return {
+      crumbs: [
+        { path: false, name: "库房管理" },
+        { path: false, name: "仓库管理" },
+        { path: false, name: "仓库设置" },
+      ],
+      options:[],
+      h1:"",
+      h2:"",
+      h3:"",
+      h4:"",
+    };
+  },
+
+  created(){
+    this.initData()
+  },
+
+  methods:{
+      returnTo(){
+          this.$router.back(-1)
+      },
+    initData() {
+      let params = {};
+      //获取当前机构的所有可用仓库名称接口
+      getallstorehousename(params).then((response) => {
+        if (response.data.state == 1) {
+          this.options = response.data.data.list;
+        }
+      });
+      let param ={}
+      findstorehouseconfig(param).then((response) => {
+        if (response.data.state == 1) {
+          console.log("response",response)
+          this.h1 = response.data.data.storehouse_info;
+          this.h2 = response.data.data.storehouse_out_info;
+          this.h3 = response.data.data.drug_storehouse_info;
+          this.h4 = response.data.data.drug_storehouse_out;
+        }
+      });
+    },
+
+    handleSelect1(item) {
+      this.h1 = item.storehouse_name;
+    },
+    handleSelect2(item) {
+      this.h2 = item.storehouse_name;
+    },
+    handleSelect3(item) {
+      this.h3 = item.storehouse_name;
+    },
+    handleSelect4(item) {
+      this.h4 = item.storehouse_name;
+    },
+    updateconfig1(h1){
+      let params = {
+        id:h1
+      };
+      updateinfo(params).then((response) => {
+        if (response.data.state == 1) {
+          this.$message.success("修改成功");
+        }
+      });
+    },
+    updateconfig2(h2){
+      let params = {
+        id:h2
+      };
+      updateoutinfo(params).then((response) => {
+        if (response.data.state == 1) {
+          this.$message.success("修改成功");
+        }
+      });
+    },
+    updateconfig3(h3){
+      let params = {
+        id:h3
+      };
+      updatedruginfo(params).then((response) => {
+        if (response.data.state == 1) {
+          this.$message.success("修改成功");
+        }
+      });
+    },
+    updateconfig4(h4){
+      let params = {
+        id:h4
+      };
+      updatedrugout(params).then((response) => {
+        if (response.data.state == 1) {
+          this.$message.success("修改成功");
+        }
+      });
+    },
+
+
+  }
+};
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+.set-contanin {
+  width: 30%;
+  height: 50%;
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  /* 横竖都居中 */
+  margin: auto;
+  .select-list {
+    display: flex;
+    padding: 10px 0;
+  }
+}
+/deep/ .el-input__inner {
+  width: 202px;
+}
+</style>

src/xt_pages/supply/components/addGoodReturn.vue

@@ -717,12 +717,15 @@ export default {
       this.recordInfo.tableList.push(tempObj);
     },
     handleDelete: function (index, row) {
-      if (this.recordInfo.tableList.length <= 1) {
-        this.$message.error("只有一条记录的时候无法删除");
-        return;
-      }else{
-        this.recordInfo.tableList.splice(index, 1);
+      if(row.id == 0){
+       if (this.recordInfo.tableList.length <= 1) {
+          this.$message.error("只有一条记录的时候无法删除");
+          return;
+        }else{
+          this.recordInfo.tableList.splice(index, 1);
+        }
       }
+     
       if (row.id > 0) {
         const params = {
             id: row.id
@@ -821,10 +824,18 @@ export default {
     },
   getAllPrice() {
       var total_price = 0;
+      console.log(this.recordInfo.tableList,'this.recordInfo.tableList')
       for (let i = 0; i < this.recordInfo.tableList.length; i++) {
-        total_price += this.recordInfo.tableList[i].supply_price *this.recordInfo.tableList[i].supply_count - (this.recordInfo.tableList[i].supply_price*this.recordInfo.tableList[i].supply_count*(this.recordInfo.tableList[i].deposit_rate/100));
+        total_price += 
+        this.recordInfo.tableList[i].supply_price*
+        this.recordInfo.tableList[i].supply_count - 
+        (this.recordInfo.tableList[i].supply_price*
+        this.recordInfo.tableList[i].supply_count*
+        (this.recordInfo.tableList[i].deposit_rate/100));
+        console.log(total_price,'this.total_price')
       }
       this.total_price = total_price;
+      
       // this.discount_amount = (this.total_price * this.rate_of_concession * 0.01).toFixed(2);
       if(total_price > 0){
         return total_price.toFixed(2);
@@ -889,12 +900,12 @@ export default {
       var ids = this.$route.query.ids;
       getGoodOrderDetailList(id,ids).then((response) => {
         if (response.data.state == 1) {
+          console.log(response.data.data.list,'oooresponse.data.data.list')
           var out = response.data.data.out;
           this.id = out.id;
           this.supplier_name = out.supplier_id;
           this.rate_of_concession = out.rate_of_concession;
           this.discount_amount = out.discount_amount;
-
           this.start_time = this.getTimes(out.document_date);
           var orderInfo = response.data.data.list;
           console.log("orderINFO233232232332", orderInfo);
@@ -974,8 +985,6 @@ export default {
                   orderInfo[i].unitList[0].name = goodList[j].packing_unit;
                   orderInfo[i].count =  this.getTotalStockCountSix(orderInfo[i].good_warehouse_info,orderInfo[i].warehouse_out_id)
                 }
-
-               
               }
               orderInfo[i].sum_count = orderInfo[i].count
               orderInfo[i].min_number = 0
@@ -1222,7 +1231,7 @@ export default {
        warehouse_out_id:this.warehouse_out_id,
        id:this.id,
      }
-     console.log("审核2322323232323",params)
+    //  console.log("审核2322323232323",params)
  
      checkReturnOrder(params).then(response=>{
        if(response.data.state == 1){