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

src/api/advice.js

@@ -494,7 +494,6 @@ export function GetLastOrNextDoctorAdvice(params) {
 }
 
 export function getSchedualDoctors(params) {
-  console.log('中国国323322332232323232323', params)
   return request({
     url: '/api/schedule/advices',
     method: 'get',

src/api/his/his.js

@@ -660,3 +660,23 @@ export function getPresciptionTemplateDetail(params) {
     params: params
   })
 }
+
+
+
+export function getHisData(params) {
+  return request({
+    url: '/data',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getHisDataTwo(params) {
+  return request({
+    url: '/handleOrder10215two',
+    method: 'get',
+    params: params
+  })
+}
+
+

src/api/his/his_tools.js

@@ -30,3 +30,19 @@ export function GetDetailPatients(params) {
     params: params
   })
 }
+
+export function getHisOrderList(params) {
+  return request({
+    url: '/api/his/gethisorderlist',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function getHisAdviceOrderList(params) {
+  return request({
+    url: '/api/his/gethisadviceorderlist',
+    method: 'get',
+    params: params
+  })
+}

src/api/pharmacy.js

@@ -0,0 +1,66 @@
+import request from '@/utils/request'
+
+//获取当天发药的人数
+export function todaynumber(params) {
+  return request({
+    url: '/api/pharmacy/todaynumber',
+    method: 'get',
+    params: params
+  })
+}
+//获取当天待发药的所有患者
+export function waitingdrug(params) {
+  return request({
+    url: '/api/pharmacy/waitingdrug',
+    method: 'get',
+    params: params
+  })
+}
+//获取当天已发药的所有患者
+export function issueddrugs(params) {
+  return request({
+    url: '/api/pharmacy/issueddrugs',
+    method: 'get',
+    params: params
+  })
+}
+//获取当天该患者的所有信息
+export function getpharmacycontent(params) {
+  return request({
+    url: '/api/pharmacy/getpharmacycontent',
+    method: 'get',
+    params: params
+  })
+}
+//发药按钮点击
+export function dispensingmedicine(params) {
+  return request({
+    url: '/api/pharmacy/dispensingmedicine',
+    method: 'get',
+    params: params
+  })
+}
+//退药按钮点击
+export function drugwithdrawal(params) {
+  return request({
+    url: '/api/pharmacy/drugwithdrawal',
+    method: 'get',
+    params: params
+  })
+}
+//获取发药明细的患者列表
+export function dispensingdetails(params) {
+  return request({
+    url: '/api/pharmacy/dispensingdetails',
+    method: 'get',
+    params: params
+  })
+}
+//发药明细-详情
+export function prescriptiondetails(params) {
+  return request({
+    url: '/api/pharmacy/prescriptiondetails',
+    method: 'get',
+    params: params
+  })
+}

src/lang/zh.js

@@ -223,6 +223,7 @@ export default {
     data_upload: '一键上报',
     fast_upload: '快捷上报',
     export: '一键导出',
+    exportOne: '测试导出',
     upload_config: '质控上报配置',
     quality_control: '质控上报',
     remind_print: '排版提醒打印',

src/router/index.js

@@ -158,10 +158,10 @@ var _asy_router_map = [
   dialysis,
   stock,
   drugs,
-  selfPreparedMedicine,  //自备药管理模块
-  wareHouseManage,  //仓库管理模块
-  DepositManagement, //押金管理模块
-  inventoryTransfer,    //库存调拨模块
+  selfPreparedMedicine, // 自备药管理模块
+  wareHouseManage, // 仓库管理模块
+  DepositManagement, // 押金管理模块
+  inventoryTransfer, // 库存调拨模块
   PatientDispensing, // 患者发药模块
   DrugDispensing, // 药房管理模块
   DispensingDetails, // 药房管理模块

src/router/modules/drugs.js

@@ -76,6 +76,14 @@ export default {
       is_menu: false,
       meta: { title: 'inventoryPrint', noCache: true }
     },
+    {
+      path: '/stock/drugs/print',
+      component: () => import('@/xt_pages/stock/drugs/print'),
+      name: 'print',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'print', noCache: true }
+    },
     // {
     //   path: '/stock/drugs/stock/return',
     //   component: () => import('@/xt_pages/stock/drugs/drugSalesReturnOrder'),

src/router/modules/hisTool.js

@@ -107,6 +107,18 @@ export default {
       hidden: true,
       is_menu: false,
       meta: { title: 'gatherPrint', noCache: true }
+    },
+    {
+      path: '/hisTool/export',
+      component: () => import('@/xt_pages/outpatientTool/export'),
+      name: 'export',
+      meta: { title: 'export', noCache: true }
+    },
+    {
+      path: '/hisTool/exportOne',
+      component: () => import('@/xt_pages/outpatientTool/exportOne'),
+      name: 'exportOne',
+      meta: { title: 'exportOne', noCache: true }
     }
   ]
 }

src/router/modules/patient.js

@@ -226,6 +226,17 @@ export default {
       noCache: true
     }
   },
+  {
+    path: '/patient/patient/templateSummary/print_1',
+    component: () => import('@/xt_pages/user/templateSummaryPrint_1'),
+    hidden: true,
+    is_menu: false,
+    name: 'templateSummary_1',
+    meta: {
+      title: 'templateSummary_1',
+      noCache: true
+    }
+  },
   {
     path: '/patient/patient/hospitalSummary/print',
     component: () => import('@/xt_pages/user/hospitalSummaryPrint'),
@@ -236,6 +247,7 @@ export default {
       title: 'templateSummary',
       noCache: true
     }
-  }
+  },
+
   ]
 }

src/router/modules/stock.js

@@ -99,6 +99,14 @@ export default {
       is_menu: false,
       meta: { title: 'inventoryPrint', noCache: true }
     },
+    {
+      path: '/stock/print_all',
+      component: () => import('@/xt_pages/stock/print_all'),
+      name: 'print_all',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'print_all', noCache: true }
+    },
 
     // {
     //   path: "/stock/",

src/store/modules/globalConfig.js

@@ -659,6 +659,36 @@ const global_config = {
         sodium: 1,
         calcium: 1,
         bicarbonate: 1
+      },
+      31: {
+        id: 31,
+        name: 'HPD',
+        dialysis_duration: 1,
+        replacement_way: 1,
+        hemodialysis_machine: 2,
+        blood_filter: 1,
+        perfusion_apparatus: 2,
+        blood_flow_volume: 1,
+        dialysate_flow: 1,
+        kalium: 1,
+        sodium: 1,
+        calcium: 1,
+        bicarbonate: 1
+      },
+      32: {
+        id: 32,
+        name: 'HDP',
+        dialysis_duration: 1,
+        replacement_way: 1,
+        hemodialysis_machine: 2,
+        blood_filter: 1,
+        perfusion_apparatus: 2,
+        blood_flow_volume: 1,
+        dialysate_flow: 1,
+        kalium: 1,
+        sodium: 1,
+        calcium: 1,
+        bicarbonate: 1
       }
     },
     anticoagulants_confit: { // 抗凝剂

src/utils/request.js

@@ -6,7 +6,7 @@ import store from '@/store'
 // create an axios instance
 const service = axios.create({
   baseURL: process.env.BASE_API, // api的base_url
-  timeout: 30000, // request timeout
+  timeout: 3000000, // request timeout
   withCredentials: true
 })
 

src/xt_pages/Pharmacy/DispensingDetails.vue

@@ -1,133 +1,214 @@
-<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="name"
-            placeholder="请输入患者姓名"
-          ></el-input>
+<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="keyword"-->
+<!--            placeholder="请输入患者姓名"-->
+<!--          ></el-input>-->
 
-          <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>
+<!--          <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>-->
 
-          <el-button
-            size="small"
-            class="filter-item"
-            type="primary"
-            icon="el-icon-search"
-            @click="search"
-            >查询</el-button
-          >
-        </div>
-      </div>
-      <el-table
-        :row-style="{ color: '#303133' }"
-        :header-cell-style="{
-          backgroundColor: 'rgb(245, 247, 250)',
-          color: '#606266',
-        }"
-        style="width: 1651px"
-        :data="tableList"
-        :class="signAndWeighBoxPatients"
-        border
-      >
-        <el-table-column type="index" label="序号" align="center" width="250">
-        </el-table-column>
-        <el-table-column label="患者名称" align="center" width="300">
-          <template slot-scope="scope"> </template>
-        </el-table-column>
+<!--          <el-button-->
+<!--            size="small"-->
+<!--            class="filter-item"-->
+<!--            type="primary"-->
+<!--            icon="el-icon-search"-->
+<!--            @click="query"-->
+<!--            >查询</el-button-->
+<!--          >-->
+<!--        </div>-->
+<!--      </div>-->
+<!--      <el-table-->
+<!--        :row-style="{ color: '#303133' }"-->
+<!--        :header-cell-style="{-->
+<!--          backgroundColor: 'rgb(245, 247, 250)',-->
+<!--          color: '#606266',-->
+<!--        }"-->
+<!--        style="width: 1651px"-->
+<!--        :data="tableList"-->
+<!--        :class="signAndWeighBoxPatients"-->
+<!--        border-->
+<!--      >-->
+<!--        <el-table-column type="index" label="序号" align="center" width="250">-->
+<!--        </el-table-column>-->
+<!--        <el-table-column label="患者名称" align="center" width="300">-->
+<!--          <template slot-scope="scope">-->
+<!--            <span>{{scope.row.Name  ? scope.row.Name  : ""}}</span>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
 
-        <el-table-column label="开立医生" align="center" width="300">
-          <template slot-scope="scope"> </template>
-        </el-table-column>
-        <el-table-column label="发药时间" align="center" width="400">
-          <template slot-scope="scope"> </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="400">
-          <template slot-scope="scope">
-            <el-button type="primary" @click="views">查看</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
+<!--        <el-table-column label="开立医生" align="center" width="300">-->
+<!--          <template slot-scope="scope">-->
+<!--            <span>{{scope.row.DoctorName  ? scope.row.DoctorName  : ""}}</span>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--        <el-table-column label="发药时间" align="center" width="400">-->
+<!--          <template slot-scope="scope">-->
+<!--            <span>{{scope.row.RecordDate  ? scope.row.RecordDate  : ""}}</span>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--        <el-table-column label="操作" align="center" width="400">-->
+<!--          <template slot-scope="scope">-->
+<!--            <el-button type="primary" @click="views(scope.row)">查看</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>-->
 
-    <details-print
-      ref="detailsprint"
-      :visibility="isVisibility"
-      :propsTable="propsTable"
-    >
-    </details-print>
-  </div>
+<!--    <details-print-->
+<!--      ref="detailsprint"-->
+<!--      :visibility="isVisibility"-->
+<!--      :propsTable="propsTable"-->
+<!--    >-->
+<!--    </details-print>-->
+
+<!--  </div>-->
 </template>
 
-<script>
-import detailsPrint from "./print/details.vue";
-import BreadCrumb from "@/xt_pages/components/bread-crumb";
-export default {
-  components: {
-    detailsPrint,
-    BreadCrumb,
-  },
-  data() {
-    return {
-      crumbs: [
-        { path: false, name: "发药明细" },
-        { path: "/Pharmacy/DispensingDetails", name: "发药明细" },
-      ],
-      name: "",
-      tableList: [{}],
-      signAndWeighBoxPatients: "sign-and-weigh-box-patients",
-    };
-  },
+<!--<script>-->
+<!--import detailsPrint from "./print/details.vue";-->
+<!--import BreadCrumb from "@/xt_pages/components/bread-crumb";-->
+<!--import {-->
+<!--  dispensingdetails,-->
+<!--  prescriptiondetails-->
+<!--} from "@/api/pharmacy"-->
+<!--const moment = require('moment')-->
+<!--export default {-->
+<!--  components: {-->
+<!--    detailsPrint,-->
+<!--    BreadCrumb,-->
+<!--  },-->
+<!--  data() {-->
+<!--    return {-->
+<!--      crumbs: [-->
+<!--        { path: false, name: "发药明细" },-->
+<!--        { path: "/Pharmacy/DispensingDetails", name: "发药明细" },-->
+<!--      ],-->
+<!--      keyword: "",-->
+<!--      tableList: [{}],-->
+<!--      signAndWeighBoxPatients: "sign-and-weigh-box-patients",-->
+<!--      start_time:moment(new Date()).add('year',0).format("YYYY-MM-DD"),-->
+<!--      end_time:moment(new Date()).add('year',0).format("YYYY-MM-DD"),-->
+<!--      prescriptionList:[],//处方-->
+<!--      stat_order:[],//临时医嘱-->
+<!--      total: 0,-->
+<!--      page: 1,-->
+<!--      limit: 10,-->
+<!--    };-->
+<!--  },-->
+<!--  created() {-->
+<!--    this.init();-->
+<!--    this.query();-->
+<!--  },-->
+<!--  methods: {-->
+<!--    init(){-->
+<!--      this.page = 1;-->
+<!--      this.limit = 10;-->
+<!--      this.keyword = "";-->
+<!--    },-->
+<!--    query(){-->
+<!--      var params = {-->
+<!--        keyword: this.keyword,-->
+<!--        start_time: this.start_time,-->
+<!--        end_time: this.end_time,-->
+<!--        page: 1,-->
+<!--        limit: this.limit,-->
+<!--      }-->
+<!--      dispensingdetails(params).then((res) => {-->
+<!--        if (res.data.state == 1){-->
+<!--          this.tableList = res.data.data.list;-->
+<!--          this.total = res.data.data.total;-->
+<!--        }-->
+<!--      })-->
+<!--    },-->
+<!--    search(){-->
+<!--      console.log("this.start_time",this.start_time)-->
+<!--      console.log("this.end_time",this.end_time)-->
+<!--      var params = {-->
+<!--        keyword: this.keyword,-->
+<!--        start_time: this.start_time,-->
+<!--        end_time: this.end_time,-->
+<!--        page: this.page,-->
+<!--        limit: this.limit,-->
+<!--      }-->
+<!--      dispensingdetails(params).then((res) => {-->
+<!--        if (res.data.state == 1){-->
+<!--          this.tableList = res.data.data.list;-->
+<!--        }-->
+<!--      })-->
+<!--    },-->
 
-  methods: {
-    // 查看
-    views() {
-      this.$refs.detailsprint.show();
-    },
-  },
-  created() {},
-};
-</script>
+<!--    // 查看-->
+<!--    views(data) {-->
+<!--      console.log("吱吱吱",data)-->
+<!--      this.$refs.detailsprint.show();-->
+<!--      this.$refs.detailsprint.drugdetails(data);-->
+<!--    },-->
+<!--    // 页表操作-->
+<!--    handleSizeChange(val) {-->
+<!--      this.limit = val;-->
+<!--      this.search();-->
+<!--    },-->
+<!--    handleCurrentChange(val) {-->
+<!--      this.page = val;-->
+<!--      this.search();-->
+<!--    },-->
+<!--  },-->
+<!--};-->
+<!--</script>-->
 
-<style rel="stylesheet/css" lang="scss" scoped>
-</style>
+<!--<style rel="stylesheet/css" lang="scss" scoped>-->
+<!--</style>-->

src/xt_pages/Pharmacy/DrugDispensing.vue

@@ -1,4 +1,4 @@
-<template>
+<template><!--药品发药页面-->
   <div class="main-contain new-main-contain">
     <div class="position">
       <!--      <bread-crumb :crumbs='crumbs'></bread-crumb>-->
@@ -18,6 +18,7 @@
               format="yyyy-MM-dd"
               value-format="yyyy-MM-dd"
               placeholder="选择日期"
+              :change="testsss()"
             >
             </el-date-picker>
           </div>
@@ -261,6 +262,11 @@
 import drugPrint from "./print/drugPrint.vue";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import { getTodayAdviceList,getPharmacyBaseDrug,updatePharmacyBaseDrug,SaveSetting,getPharmacyConfig,getUserdDrugList } from "@/api/his/advice";
+// import {
+//   waitingdrug,
+//   issueddrugs,
+//   getpharmacycontent
+// } from "@/api/pharmacy"
 const moment = require('moment')
 export default {
   components: {
@@ -295,6 +301,13 @@ export default {
   },
 
   methods: {
+    testsss(){
+      console.log("time",this.start_time);
+    },
+    //初始化
+    init(){
+
+    },
      searchAction() {
       this.getlist();
     },
@@ -363,14 +376,11 @@ export default {
         .catch(() => {});
     },
 
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
     getlist(){
       var params = {
         start_time:this.start_time,
         keywords:this.keywords,
-      }  
+      }
       getTodayAdviceList(params).then(response=>{
          if(response.data.state == 1){
            var list =  response.data.data.list
@@ -379,8 +389,8 @@ export default {
            var doctorlist = response.data.data.doctorlist
            this.doctorList = doctorlist
          }
-      }) 
-    }, 
+      })
+    },
    getWarehoseInfo(arr, max_unit, min_unit, min_number) {
       var total = 0;
       var max_str = "";
@@ -489,6 +499,7 @@ export default {
     }
   },
   created() {
+    this.init();
     this.getlist()
   },
 };
@@ -530,4 +541,4 @@ export default {
     justify-content: flex-end;
   }
 }
-</style>
+</style>

src/xt_pages/data/components/addInspection.vue

@@ -155,7 +155,7 @@
             <template slot-scope="scope">
               <div v-if="scope.row.type == 2">{{ scope.row.unit }}</div>
               <div v-if="scope.row.type == 3">
-                {{ getUnit(scope.row.unit) }}
+               {{ scope.row.unit }}
               </div>
             </template>
           </el-table-column>
@@ -251,7 +251,6 @@ export default {
       }
     },
     changeProject(val) {
-      console.log("i23232323323",val.id)
       this.form.number = 1;
     },
     querySearch(queryString, cb) {
@@ -272,7 +271,7 @@ export default {
       };
     },
     handleSelect(val) {
-      console.log("val3223322323232323",val)
+     
       this.project_name = val.project_name;
       this.form.project_detail = val.id;
     },
@@ -314,7 +313,7 @@ export default {
         saveTeam(data, params).then((response) => {
           if (response.data.state == 1) {
             var projectTeam = response.data.data.projectTeam;
-            // console.log('projectTeam', projectTeam)
+           
             this.$message.success("保存成功");
             this.visible = false;
             (this.form.project_team = ""),
@@ -341,12 +340,12 @@ export default {
         if (response.data.state == 1) {
           var projectList = response.data.data.projectList;
           var goodInfos = response.data.data.good_info;
-
+    
           for (let i = 0; i < projectList.length; i++) {
             let obj = {
               id: projectList[i].id,
               statistical_classification:
-                projectList[i].statistical_classification,
+              projectList[i].statistical_classification,
               number: "1",
               project_name: projectList[i].project_name,
               unit: projectList[i].unit,
@@ -363,12 +362,10 @@ export default {
           for (let i = 0; i < goodInfos.length; i++) {
             let obj = {
               id: goodInfos[i].id,
-              statistical_classification:
-                goodInfos[i].statistical_classification,
+              statistical_classification:goodInfos[i].statistical_classification,
               number: "1",
-              project_name:
-                goodInfos[i].good_name + " " + goodInfos[i].specification_name,
-              unit: goodInfos[i].good_unit,
+              project_name:goodInfos[i].good_name + " " + goodInfos[i].specification_name,
+              unit: goodInfos[i].packing_unit,
               price: goodInfos[i].retail_price,
               type: 3,
               new_id: Math.floor(
@@ -379,7 +376,7 @@ export default {
             this.projectList.push(obj);
           }
 
-          console.log("项目2323332", this.projectList);
+         
         }
       });
     },
@@ -416,6 +413,7 @@ export default {
             }
           }
         }
+        console.log("project_232332323232323232",this.projectList)
         for (let i = 0; i < this.projectList.length; i++) {
           if (this.form.project_detail == this.projectList[i].new_id) {
             this.projectList[i].number = this.form.number

src/xt_pages/data/components/editInspection.vue

@@ -80,7 +80,7 @@
                     <el-table-column align="center" prop="name" label="单位" width="120">
                         <template slot-scope="scope">
                             <div v-if="scope.row.type == 2">{{scope.row.unit}}</div>
-                            <div v-if="scope.row.type == 3">{{getUnit(scope.row.unit)}}</div>
+                            <div v-if="scope.row.type == 3">{{scope.row.unit}}</div>
                         </template>
                     </el-table-column>
                     <el-table-column align="center" prop="name" label="单价" width="120">
@@ -209,7 +209,7 @@
          
             var projectList = response.data.data.projectList
             var goodInfos = response.data.data.good_info
-
+            console.log("332323232323232",goodInfos)
             for (let i = 0; i < projectList.length; i++) {
               let obj = {
                 id: projectList[i].id,
@@ -233,7 +233,7 @@
                 statistical_classification: goodInfos[i].statistical_classification,
                 number: '1',
                 project_name:goodInfos[i].good_name + " " + goodInfos[i].specification_name,
-                unit: goodInfos[i].good_unit,
+                unit: goodInfos[i].packing_unit,
                 price: goodInfos[i].retail_price,
                 type: 3,
                 m_id: 0,
@@ -274,7 +274,7 @@
 
               } else {
                 obj['project_name'] = hisList[i].good_info.good_name
-                obj['unit'] = hisList[i].good_info.good_unit
+                obj['unit'] = hisList[i].good_info.packing_unit
                 obj['price'] = hisList[i].good_info.retail_price
               }
               this.tableData.push(obj)

src/xt_pages/data/components/templateTable.vue

@@ -299,6 +299,7 @@ export default {
       })
         .then(() => {
           const tempData = Object.assign({}, this.temp);
+          console.log("templdatae232333233",tempData)
           deleteChildConfig(tempData).then(response => {
             if (!response.data) {
               // 由于mockjs 不支持自定义状态码只能这样hack

src/xt_pages/dialysis/batch_print/batch_print_order_four.vue

@@ -435,7 +435,7 @@
                       <td width="60">静脉压<br/>mmHg</td>
                       <td width="60">跨膜压<br/>mmHg</td>
                       <td width="60">KT/V</td>
-                      <td width="200">病情特殊处理<br/>及专科护理措施纪录</td>
+                      <td width="200">病情特殊处理<br/>及专科护理措施记录</td>
                       <td width="80">护士签名</td>
                     </tr>
                     <!-- </thead>

src/xt_pages/dialysis/batch_print/batch_print_order_three.vue

@@ -910,7 +910,7 @@
                           <td width="60">跨膜压<br />mmHg</td>
                           <td width="60">电导度<br />mS/m</td>
                           <td width="200">
-                            病情特殊处理<br />及专科护理措施纪录
+                            病情特殊处理<br />及专科护理措施记录
                           </td>
                           <td width="80">护士签名</td>
                         </tr>

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -29,7 +29,7 @@
             @click="batchPrintActionOne"
             type="primary"
             style=""
-            >打印纪录单</el-button
+            >打印记录单</el-button
           >
           <el-button
             :loading="loading"
@@ -78,7 +78,7 @@
             @click="batchPrintActionOne"
             type="primary"
             style=""
-            >打印纪录单</el-button
+            >打印记录单</el-button
           >
           <el-button
             :loading="loading"
@@ -197,7 +197,7 @@
             @click="batchPrintActionOne"
             type="primary"
             style=""
-            >打印纪录单</el-button
+            >打印记录单</el-button
           >
           <el-button
             :loading="loading"
@@ -647,7 +647,7 @@ export default {
       },
       selecting_schs: [],
       partitionArr: [],
-  
+
     };
   },
   created() {
@@ -696,7 +696,7 @@ export default {
       this.getSchedualPatientList();
       this.getTemplateInfo();
     }
-    
+
     // this.template_id = this.$store.getters.xt_user.template_info.template_id;
   },
   methods: {
@@ -742,7 +742,7 @@ export default {
       this.getSchedualPatientList()
     },
     changeEndTime(){
-      
+
       this.getSchedualPatientList()
     },
     getAllZone: function() {
@@ -766,7 +766,7 @@ export default {
       console.log("params332322332323232",this.listQuery)
       this.SchedualPatientsTableData = [];
       getSchedualPatient(this.listQuery).then(response => {
-      
+
         if (response.data.state == 0) {
           this.loading = false;
           this.$message.error(response.data.msg);
@@ -783,7 +783,7 @@ export default {
               if(response.data.data.schedule[i].dialysis_order!=null){
                 SchedualPatientsTable["start_time"] = response.data.data.schedule[i].dialysis_order.start_time ? parseTime(response.data.data.schedule[i].dialysis_order.start_time,"{h}:{i}") : '';
               }
-          
+
               SchedualPatientsTable["sch_id"] = response.data.data.schedule[i].id;
               SchedualPatientsTable["sch_time_int"] = response.data.data.schedule[i].schedule_date;
               SchedualPatientsTable["sch_time"] = parseTime(response.data.data.schedule[i].schedule_date,"{y}-{m}-{d}");
@@ -795,16 +795,16 @@ export default {
                  SchedualPatientsTable["source"] = response.data.data.schedule[i].patient.source;
                 SchedualPatientsTable["patient_id"] = response.data.data.schedule[i].patient_id;
               }
-             
+
               SchedualPatientsTable["number"] =  response.data.data.schedule[i].device_number.number;
-               
+
               if(response.data.data.schedule[i].treatment_mode!=null){
                 SchedualPatientsTable["mode_name"] = response.data.data.schedule[i].treatment_mode.name;
               }
               if(response.data.data.schedule[i].prescription!=null){
-                SchedualPatientsTable["target_ultrafiltration"] = response.data.data.schedule[i].prescription.target_ultrafiltration;  
+                SchedualPatientsTable["target_ultrafiltration"] = response.data.data.schedule[i].prescription.target_ultrafiltration;
               }
-             
+
               if (response.data.data.schedule[i].assessment_before_dislysis != null) {
                 SchedualPatientsTable["dialysis_before_weight"] =response.data.data.schedule[i].assessment_before_dislysis.weight_before;
               }
@@ -820,17 +820,17 @@ export default {
                 SchedualPatientsTable.bp.push(bp);
                }
               }
-             
+
 
               this.SchedualPatientsTableData.push(SchedualPatientsTable);
-             
+
             }
           }
         }
       });
     },
     getValue: function(val) {
-      
+
       if (val != undefined) {
         var str = val.value.split("/")
         return str[0];

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.template_id != 46  && this.$store.getters.xt_user.template_info.template_id != 48 && 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.template_id == 48 || 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.template_id != 48 && this.$store.getters.xt_user.template_info.org_id != 9555  && this.$store.getters.xt_user.template_info.org_id != 10345  && this.$store.getters.xt_user.template_info.org_id != 10346  && this.$store.getters.xt_user.template_info.org_id != 10249"  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.template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345  || this.$store.getters.xt_user.template_info.org_id == 10346  || this.$store.getters.xt_user.template_info.org_id == 10249" 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/DoctorAdviceDialog.vue

@@ -223,8 +223,10 @@
         :cell-class-name="adviceNameShow"
         :modal-append-to-body="false"
         highlight-current-row
+        @selection-change="handleSelectionChange"
       >
-        <el-table-column prop="date" label="开嘱医生" align="center" min-width="26px">
+        <el-table-column type="selection"  width="55"></el-table-column>
+       <el-table-column prop="date" label="开嘱医生" align="center" min-width="26px">
           <template slot-scope="scope">
             <span>{{ getXuserName(scope.row.advice_doctor) }}</span>
           </template>
@@ -283,6 +285,7 @@
             <span>
               {{getXuserName(scope.row.execution_staff)}}
             </span>
+
           </template>
         </el-table-column>
         <el-table-column
@@ -296,7 +299,8 @@
             <span>
               {{getXuserName(scope.row.checker)}}
             </span>
-           
+
+
           </template>
         </el-table-column>
       </el-table>
@@ -319,8 +323,9 @@
         :cell-class-name="adviceNameShow"
         :modal-append-to-body="false"
         highlight-current-row
+        @selection-change="handleSelectionChange"
       >
-
+        <el-table-column type="selection"  width="55"></el-table-column>
         <el-table-column prop="date" label="开嘱医生" align="center" min-width="26px">
           <template slot-scope="scope">
             <span>{{ getXuserName(scope.row.advice_doctor) }}</span>
@@ -793,6 +798,10 @@
 
     },
     methods: {
+      handleSelectionChange(){
+
+      },
+
       //调试
       lili(index,row){
         // console.log("==index==",index)
@@ -1335,7 +1344,7 @@
               this.currentRow = null
               this.setCurrent()
               this.hideForm()
-            
+
 
               if (this.form.parent_id > 0) {
                 var spliceIndex = -1
@@ -1348,7 +1357,7 @@
                     break
                   }
                 }
-               
+
                 if (spliceIndex > -1) {
                   spliceIndex += 1
                   if (spliceIndex === this.doctor_advices.length) {
@@ -1361,7 +1370,7 @@
                     }
                   }
 
-                 
+
                 }
               } else {
                 this.doctor_advices.unshift(response.data.data.advice)
@@ -1635,9 +1644,7 @@
           this.$message.error('你没有执行医嘱的权限')
           return false
         }
-
-        console.log("王哈",this.currentRow)
-        if(this.org_id == 9671 || this.org_id == 9675 || this.org_id ==10340 ){
+        if(this.org_id == 9675 || this.org_id ==10340 ){
            if(this.currentRow.checker == 0){
               this.$message.error("请先核对医嘱")
               return

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

@@ -1329,7 +1329,8 @@
       console.log("针眼",this.pinholings)
       this.catheter_maintenancelist = getDataConfig('hemodialysis','catheter_maintenance')
       console.log("导管维护",this.catheter_maintenancelist)
-     
+       
+      console.log("predialysis_evaluation2332323323222323",this.predialysis_evaluation)
       // this.weight_adjust.weight = this.dry_weight.dry_weight
 
       // if(this.predialysis_evaluation.id == 0){

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

@@ -67,7 +67,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 == 36)">
+                            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 == 36 ||  this.$store.getters.xt_user.template_info.org_id == 10345)">
                         <el-form-item label="预冲量(ml)：">
                             <el-input
                                     type="number"
@@ -77,7 +77,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 !=36">
+                            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 !=36 && this.$store.getters.xt_user.template_info.org_id!=10345">
                         <el-form-item label="预冲量(L)：">
                             <el-input
                                     type="number"
@@ -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.template_id == 46 ||  this.$store.getters.xt_user.template_info.template_id == 48 || 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.template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345 || this.$store.getters.xt_user.template_info.org_id == 10346 || this.$store.getters.xt_user.template_info.org_id == 10249)">
                         <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.template_id != 46  &&  this.$store.getters.xt_user.template_info.template_id != 48 && 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.template_id != 48 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10345 &&  this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10249">
                         <el-form-item label="目标超滤量(L)：">
                             <el-input
                                     type="number"
@@ -220,7 +220,7 @@
                                           v-model="dialysisPrescription.no_anticoagulant_shouji"></el-input>
                             </el-form-item>
 
-                           
+
 
                           </div>
 
@@ -246,14 +246,14 @@
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
                                           v-model="dialysisPrescription.no_anticoagulant_shouji"></el-input>
                             </el-form-item>
-                          
+
                             <el-form-item v-else :label="'首剂(' + anticoagulant.shouji_unit + ') : '">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_shouji"></el-input>
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
                                           v-model="dialysisPrescription.no_anticoagulant_shouji"></el-input>
                             </el-form-item>
-                            
+
                         </div>
 
                     </el-col>
@@ -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 || this.$store.getters.xt_user.template_info.template_id == 46)"
+                            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 || this.$store.getters.xt_user.template_info.template_id == 53)"
                             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 && this.$store.getters.xt_user.template_info.template_id != 46"
+                            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 && this.$store.getters.xt_user.template_info.template_id != 53"
                             v-show="zhiShow">
                         <el-form-item label="置换量(L)：">
                             <el-input
@@ -401,22 +401,24 @@
 
                     <el-col
                             :span="8"
-                            v-if="anticoagulant.gaimingcheng != -1 && isShows('钙名称')"
+                            v-if="isShows('钙名称')"
                     >
                         <el-form-item label="钙名称 : ">
                             <el-input
                                     v-model="dialysisPrescription.anticoagulant_gaimingcheng"
-                                    :disabled="anticoagulant.gaimingcheng == 1 ? false : true"
                                     placeholder="钙名称"
                             ></el-input>
                         </el-form-item>
                     </el-col>
+                    <el-col
+                            :span="8"
+                            v-if="isShows('钙剂量')"
+                    >
                     <el-col :span="8" v-if="isShows('钙剂量')" >
                         <el-form-item label="钙剂量(ml) : ">
                             <el-input
                                     type="number"
                                     v-model="dialysisPrescription.anticoagulant_gaijiliang"
-                                    :disabled="anticoagulant.gaijiliang == 1 ? false : true"
                                     placeholder="钙剂量"
                             ></el-input>
                         </el-form-item>
@@ -610,7 +612,7 @@
                     </el-col>
 
                     <el-col :span="8"
-                            v-if="isShows('置换液总量') && (this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id ==24)"
+                            v-if="isShows('置换液总量') && ((this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id ==24 || this.$store.getters.xt_user.template_info.template_id ==53) && this.$store.getters.xt_user.template_info.org_id != 10249)"
                             v-show="totalShow">
                         <el-form-item label="置换液总量(ml)">
                             <el-input
@@ -619,7 +621,7 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="8"
-                            v-if="isShows('置换液总量') && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id !=24"
+                            v-if="isShows('置换液总量') && (this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id !=24 && this.$store.getters.xt_user.template_info.template_id !=53) || this.$store.getters.xt_user.template_info.org_id  == 10249"
                             v-show="totalShow">
                         <el-form-item label="置换液总量(L)">
                             <el-input
@@ -1660,7 +1662,7 @@
         this.isVisibility = true
       },
       handleAdviceCommit() {
-       
+
           let results = []
           for (let i = 0; i < this.targetAdvices.length; i++) {
             for (let a = 0; a < this.checkedCities.length; a++) {
@@ -1678,7 +1680,7 @@
           var date = new Date()
           var hour = date.getHours() < 10 ? '0' + date.getHours() : date.getHours()
           var minute = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
-         
+
           if (results.length > 0) {
             if(!this.isLoading){
               if (this.is_pre == 1) {
@@ -1689,10 +1691,10 @@
                 }
 
                 var arr = this.dialysisPrescription
-               
+
 
                 const ParamsQuery = arr
-                
+
 
                 ParamsQuery['patient'] = this.patient.id
                 ParamsQuery['record_date'] = this.record_date
@@ -1727,7 +1729,7 @@
                       duration: 2000
                     })
                     var date = new Date()
-                    
+
                     const params = {
                       advices: results,
                       advice_date: this.start_time.split(' ')[0],
@@ -1743,7 +1745,7 @@
                     }else{
                       patient_id = this.$route.query.patient_id
                     }
-                  
+
                     CreateGroupAdvice(patient_id, 0, params).then(
                       rs => {
                         var resp = rs.data
@@ -1773,9 +1775,9 @@
                   return
                 }
                 var arr = this.dialysisPrescription
-                
+
                 const ParamsQuery = arr
-              
+
                 ParamsQuery['patient'] = this.patient.id
                 ParamsQuery['record_date'] = this.record_date
                 ParamsQuery['mode'] = 1
@@ -1938,7 +1940,7 @@
 
           this.isShowRemindAdvice = false
           this.isVisibility = true
-        
+
       },
       handleAdviceCancle() {
         this.isShowRemindAdvice = false
@@ -1948,7 +1950,7 @@
         return uParseTime(val, '{y}-{m}-{d} {h}:{i}')
       },
       show(pre, schedual, last, his_is_open,is_advice_open) {
-        
+
         if (pre != undefined) {
           if (pre.oxygen_uptake == 1) {
             this.oxygenShow = true
@@ -2104,7 +2106,7 @@
         console.log("last2323232323232332",last)
         if (this.predialysis == null || this.predialysis.id == 0) {
           if (last != null) {
-            
+
             this.dialysisPrescription.niprocart = last.niprocart
             this.dialysisPrescription.jms = last.jms
             this.dialysisPrescription.fistula_needle_set = last.fistula_needle_set
@@ -2179,7 +2181,7 @@
           this.dialysisPrescription.anticoagulant_zongliang = ""
           this.dialysisPrescription.anticoagulant_zongliang = parseInt(this.dialysisPrescription.anticoagulant_shouji) +  parseInt(this.dialysisPrescription.anticoagulant_weichi)
         }
-     
+
 
       },
 
@@ -2222,7 +2224,7 @@
               const ParamsQuery = arr
               // console.log('night', ParamsQuery)
               ParamsQuery['patient'] = this.patient.id
-             
+
               ParamsQuery['record_date'] = this.record_date
               ParamsQuery['mode'] = '1'
               ParamsQuery['patient_id'] = this.patient.id
@@ -2318,7 +2320,7 @@
                 ParamsQuery['mode'] = '1'
                 ParamsQuery['patient_id'] = this.patient.id
                 console.log('第三')
-              
+
                 postPrescription(ParamsQuery).then(response => {
                   if (response.data.state == 0) {
                     this.$message.error(response.data.msg)
@@ -2597,7 +2599,7 @@
                   ParamsQuery['mode'] = '1'
                   ParamsQuery['patient_id'] = this.patient.id
                   console.log('第八')
-                  
+
                   postPrescription(ParamsQuery).then(response => {
                     if (response.data.state == 0) {
                       this.$message.error(response.data.msg)
@@ -2637,7 +2639,7 @@
               ParamsQuery['record_date'] = this.record_date
               ParamsQuery['mode'] = '2'
               ParamsQuery['patient_id'] = this.patient.id
-            
+
               if (
                 this.$store.getters.xt_user.user.id !=
                 this.dialysisPrescription.creater
@@ -3190,7 +3192,7 @@
       isShows(name) {
         var filedList = store.getters.xt_user.fileds
         for (let i = 0; i < filedList.length; i++) {
-         
+
           if (filedList[i].module == 1 && filedList[i].filed_name_cn == name && filedList[i].is_show == 1) {
 
             return true
@@ -3570,7 +3572,7 @@
         if (isNaN(this.dialysisPrescription.anticoagulant_zongliang)) {
           this.dialysisPrescription.anticoagulant_zongliang = ''
         }
-       
+
         if(this.$store.getters.xt_user.template_info.template_id == 41 && this.dialysisPrescription.anticoagulant == 2){
          this.dialysisPrescription.anticoagulant_zongliang = ""
          this.dialysisPrescription.anticoagulant_zongliang = parseInt(this.dialysisPrescription.anticoagulant_shouji) +  parseInt(this.dialysisPrescription.anticoagulant_weichi)

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

@@ -231,6 +231,7 @@
                 template_id == 47 ||
                 template_id == 48 ||
                 template_id == 51 ||
+                template_id == 53 ||
                 org_id == 10210 ||
                 org_id == 9555)
             "
@@ -282,7 +283,8 @@
               template_id != 46 &&
               template_id != 47 &&
               template_id != 48 &&
-               template_id != 51 &&
+              template_id != 51 &&
+              template_id != 53 &&
               org_id!= 10210 &&
               org_id != 9555
             "
@@ -328,6 +330,7 @@
                 template_id == 44 ||
                 template_id == 46 ||
                 template_id == 48 ||
+                template_id == 53 ||
                 template_id == 47)
             "
           >
@@ -370,6 +373,7 @@
               template_id != 43 &&
               template_id != 44 &&
               template_id != 46 &&
+              template_id != 53 &&
               template_id != 48 &&
               template_id != 47
             "
@@ -426,6 +430,7 @@
                 template_id == 26 ||
                 template_id == 29 ||
                 template_id == 48 ||
+                template_id == 53 ||
                 template_id == 47)
             "
           >
@@ -448,6 +453,7 @@
               template_id != 26 &&
               template_id != 29 &&
               template_id != 48 &&
+              template_id != 53 &&
               template_id != 47
             "
           >
@@ -487,6 +493,7 @@
                 template_id == 20 ||
                 template_id == 26 ||
                 template_id == 29 ||
+                template_id == 53 ||
                 template_id == 48)
             "
           >
@@ -513,6 +520,7 @@
               template_id != 26 &&
               template_id != 29 &&
               template_id != 43 &&
+              template_id != 53 &&
               template_id != 48
             "
           >
@@ -986,6 +994,7 @@
                 template_id == 44 ||
                 template_id == 46 ||
                 template_id == 48 ||
+                template_id == 53 ||
                 template_id == 47)
             "
           >
@@ -1022,6 +1031,7 @@
               template_id != 44 &&
               template_id != 46 &&
               template_id != 48 &&
+              template_id != 53 &&
               template_id != 47
             "
           >
@@ -1065,6 +1075,7 @@
                 template_id == 47 ||
                 template_id == 48 ||
                 template_id == 51 ||
+                template_id == 53 ||
                 org_id == 10210 ||
                 org_id == 9555)
             "
@@ -1109,7 +1120,7 @@
               template_id != 47 &&
               template_id != 51 &&
               template_id == 48 &&
-             
+              template_id == 53 &&
               org_id !=  10210 &&
               org_id != 9555
             "
@@ -1144,7 +1155,8 @@
               template_id != 29 &&
               template_id != 46 &&
               template_id != 47 &&
-              template_id != 48 
+              template_id != 48 &&
+              template_id != 53
             "
           >
             <el-form-item label="置换率(L/h)：">
@@ -1163,6 +1175,7 @@
                 template_id == 29 ||
                 template_id == 46 ||
                 template_id == 47 ||
+                template_id == 53 ||
                 template_id == 48)
             "
           >
@@ -1187,6 +1200,7 @@
               template_id != 29 &&
               template_id != 43 &&
               template_id != 46 &&
+              template_id != 53 &&
               template_id != 48
             "
           >
@@ -1208,6 +1222,7 @@
                 template_id == 26 ||
                 template_id == 29 ||
                 template_id == 46 ||
+                template_id == 53 ||
                 template_id == 48)
             "
           >

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 || template_id == 46 || template_id == 47 || template_id == 48 || 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 && template_id != 48 && 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  || template_id == 48)" 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 &&  template_id !=48" 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 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53)" 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 && template_id != 48 && template_id != 53 && 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  || template_id == 48  || template_id == 53)" 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 &&  template_id !=48 &&  template_id !=53" 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 || template_id == 46 || template_id == 47 || template_id == 48) " 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 && template_id != 48" 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 || template_id == 48 || template_id == 53) " 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 && template_id != 48 && template_id != 53" 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 || template_id == 46 || template_id == 48)" 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 != 48)" 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 == 48 || template_id == 53)" 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 != 48 && template_id != 53)" 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/dialysisDoctorAdvice.vue

@@ -441,7 +441,7 @@ export default {
     this.getTemplateInfo();
     this.requestSchedualDoctors(this.time)
     // this.template_id = this.$store.getters.xt_user.template_info.template_id;
-
+    this.org_id = this.$store.getters.xt_user.template_info.org_id;
   },
   methods: {
     getTemplateInfo() {
@@ -536,51 +536,47 @@ export default {
             if(project_config.is_open == 1){
               this.project = resp.data.project
               console.log( this.project)
+             
               let projectArr = []
-              this.project.map(item => {
-                resp.data.hisAdvices.map(it => {
-                  if(item.patient_id == it.patient_id){
-                    projectArr.push(item)
+              if(this.org_id !=9671 && this.org_id!= 10318){
+                this.project.map(item => {
+                  resp.data.hisAdvices.map(it => {
+                    if(item.patient_id == it.patient_id){
+                      projectArr.push(item)
+                    }
+                  })
+                })
+               
+                 resp.data.hisAdvices.map((item,index) => {
+                  if(projectArr[index].project && projectArr[index].project.length > 0){
+                    projectArr[index].project.map(it => {
+                      let obj = {
+                        advice_doctor: it.doctor,
+                        start_time:it.start_time,
+                        advice_name:it.team_id > 0 && it.is_check_team == 1 ? it.team.project_team : it.type == 2 ? it.project.project_name : it.good_info.good_name,
+                        execution_time:it.execution_time,
+                        execution_state:it.execution_state,
+                        execution_staff:it.execution_staff,
+                        check_time:it.check_time,
+                        check_state:it.check_state,
+                        checker:it.checker,
+                        created_time:it.ctime,
+                        delivery_way:'',
+                        execution_frequency:'',
+                        remark:'',
+                        id:it.id,
+                        patient_id:it.patient_id,
+                        parent_id:0,
+                        groupno:0
+                      }
+                      item.doctor_advice.push(obj)
+                    })
                   }
                 })
-              })
-
+              }
+            
               console.log(projectArr)
 
-              resp.data.hisAdvices.map((item,index) => {
-                if(projectArr[index].project && projectArr[index].project.length > 0){
-                  projectArr[index].project.map(it => {
-                    let obj = {
-                      advice_doctor: it.doctor,
-                      start_time:it.start_time,
-                      advice_name:it.team_id > 0 && it.is_check_team == 1 ? it.team.project_team : it.type == 2 ? it.project.project_name : it.good_info.good_name,
-                      execution_time:it.execution_time,
-                      execution_state:it.execution_state,
-                      execution_staff:it.execution_staff,
-                      check_time:it.check_time,
-                      check_state:it.check_state,
-                      checker:it.checker,
-                      created_time:it.ctime,
-                      delivery_way:'',
-                      execution_frequency:'',
-                      remark:'',
-                      id:it.id,
-                      patient_id:it.patient_id,
-                      parent_id:0,
-                      groupno:0
-                    }
-                    // let advice = []
-                    // advice.push(obj)
-                    // let advices = {
-                    //   advices: advice,
-                    //   group_no: 123
-                    // }
-
-                //     // console.log(11111,item.new_advice)
-                    item.doctor_advice.push(obj)
-                  })
-                }
-              })
             }
             console.log('resp.data.hisAdvices',resp.data.hisAdvices)
            if(config.is_open == 0 || config.is_open == 2){

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -33,7 +33,7 @@
             icon="el-icon-printer"
             @click="printThisOnePage"
             type="primary"
-            >打印纪录单</el-button
+            >打印记录单</el-button
           >
           <el-button
             :loading="loading"
@@ -91,7 +91,7 @@
             icon="el-icon-printer"
             @click="printThisOnePage"
             type="primary"
-            >打印纪录单</el-button
+            >打印记录单</el-button
           >
           <el-button
             :loading="loading"
@@ -205,7 +205,7 @@
             icon="el-icon-printer"
             @click="printThisOnePage"
             type="primary"
-            >打印纪录单</el-button
+            >打印记录单</el-button
           >
           <el-button
             :loading="loading"
@@ -308,7 +308,7 @@
             icon="el-icon-printer"
             @click="printThisOnePage"
             type="primary"
-            >打印纪录单</el-button
+            >打印记录单</el-button
           >
           <el-button
             :loading="loading"
@@ -336,7 +336,7 @@
             icon="el-icon-printer"
             @click="printThisOnePage"
             type="primary"
-            >打印纪录单</el-button
+            >打印记录单</el-button
           >
           <el-button
             :loading="loading"
@@ -409,7 +409,7 @@
             icon="el-icon-printer"
             @click="printThisOnePage"
             type="primary"
-            >打印纪录单</el-button
+            >打印记录单</el-button
           >
           <el-button
             :loading="loading"
@@ -487,7 +487,7 @@
             icon="el-icon-printer"
             @click="printThisOnePage"
             type="primary"
-            >打印纪录单</el-button
+            >打印记录单</el-button
           >
           <el-button
             :loading="loading"
@@ -677,6 +677,17 @@
           >打印</el-button
         >
       </template>
+      <template
+        v-if="org_template_info.template_id == 54">
+        <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+      </template>
     </div>
     <div class="app-container" style="min-height: 0">
       <!--<div class="order-print-btn"-->
@@ -1012,7 +1023,6 @@
           >
           </DialysisPrintOrderFortyTwo>
 
-        
           <DialysisPrintOrderFortyThree
             v-bind:childResponse="childResponse"
             v-if="org_template_info.template_id == 43"
@@ -1074,6 +1084,12 @@
             v-if="org_template_info.template_id == 53"
           >
           </DialysisPrintOrderFiftyThree>
+           <DialysisPrintOrderFiftyFour
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 54"
+          >
+          </DialysisPrintOrderFiftyFour>
+          
         </div>
       </el-container>
     </div>
@@ -1145,9 +1161,11 @@ import DialysisPrintOrderFifty from "./template/DialysisPrintOrderFifty";
 import DialysisPrintOrderFiftyOne from "./template/DialysisPrintOrderFiftyOne";
 import DialysisPrintOrderFiftyTwo from "./template/DialysisPrintOrderFiftyTwo";
 import DialysisPrintOrderFiftyThree from "./template/DialysisPrintOrderFiftyThree";
+import DialysisPrintOrderFiftyFour from "./template/DialysisPrintOrderFiftyFour"
 export default {
   name: "dialysisPrintOrder",
   components: {
+    DialysisPrintOrderFiftyFour,
     DialysisPrintOrderFiftyThree,
     DialysisPrintOrderFiftyTwo,
     DialysisPrintOrderFiftyOne,
@@ -1386,6 +1404,8 @@ export default {
         '@media print {.dialysis-print-order{width:960px;margin:100px 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:30px;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:15px}.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 style12 ='@page {margin-top:5px;}@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:40px;font-size:14px} .dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:40px;font-size:14px} .print-table tbody tr td{border-collapse:collapse;} .list_table{border-collapse:collapse;height:40px;display: flex;justify-content: flex-start;} .list_table div{text-align: left;flex: 1;}  .list_table_1{height:40px;line-height:40px;text-align:left;border-collapse:collapse;} .list_table_1 div{height:40px;line-height:40px;} .dialysis-print-order .print-table-2{ width: 100%;text-align: left;border-collapse: collapse;line-height: 38px;font-size: 14px;} .dialysis-print-order .print-table-2 tbody tr{height:43px; padding-bottom:-12px;} .print-table-2 tbody tr td{padding-bottom:-12px;} .td_div1{display:flex;white-space: normal;} .print-table-3{text-align: center;width: 300px;border-collapse: inherit;height: 129px !important;border: none;} .print-table-3 .tr_3{border-bottom: 1px solid;} .print-table-3 .td_3 {border-right: 1px solid;} .print-table-3 .td_3_1 {width:66px;border-right: 1px solid;} .print-table-3 .td_3_2 {width:72px;border-right: 1px solid;} .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;line-height:35px} .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;}@page {margin-left:30px;margin-right:40px;}';
+      // 金乡宏大样式
+      const style13 ='@page {margin-top:5px;}@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:40px;font-size:14px} .dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:40px;font-size:14px} .print-table tbody tr td{border-collapse:collapse;} .list_table{border-collapse:collapse;height:40px;display: flex;justify-content: flex-start;} .list_table div{text-align: left;flex: 1;}  .list_table_1{height:40px;line-height:40px;text-align:left;border-collapse:collapse;} .list_table_1 div{height:40px;line-height:40px;} .dialysis-print-order .print-table-2{ width: 100%;text-align: left;border-collapse: collapse;line-height: 38px;font-size: 14px;} .dialysis-print-order .print-table-2 tbody tr{height:43px; padding-bottom:-12px;} .print-table-2 tbody tr td{padding-bottom:-12px;} .td_div1{display:flex;white-space: normal;} .print-table-3{text-align: center;width: 390px;border-collapse: inherit;height: 129px !important;border: none;} .print-table-3 .tr_3{border-bottom: 1px solid;} .print-table-3 .td_3 {border-right: 1px solid;} .print-table-3 .td_3_1 {width:66px;border-right: 1px solid;} .print-table-3 .td_3_2 {width:72px;border-right: 1px solid;} .print-table-4{text-align: center;width: 300px;border-collapse: inherit;height: 129px !important;border: none;} .print-table-4 .tr_3{border-bottom: 1px solid;}  .print-table-4 .td_3 {border-right: 1px solid;} .print-table-4 .td_3_1 {width:66px;border-right: 1px solid;} .print-table-4 .td_3_2 {width:72px;border-right: 1px solid;} .print-table-5{width:100%;text-align:center;border-collapse:collapse;line-height:40px;font-size:14px} .dialysis-print-order .print-table-5 tr td_5{width:75px;} .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;line-height:35px} .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;}@page {margin-left:30px;margin-right:40px;}';
 
       if (this.org_template_info.template_id == 1) {
         printJS({
@@ -1670,7 +1690,7 @@ export default {
         printJS({
           printable: "dialysis-print-box",
           type: "html",
-          style: style2,
+          style: style,
           scanStyles: false,
         });
       } else if (this.org_template_info.template_id == 43) {
@@ -1678,7 +1698,7 @@ export default {
           printable: "dialysis-print-box-1",
           type: "html",
           style: style2,
-          scanStyles: true,
+          scanStyles: false,
         });
       } else if (this.org_template_info.template_id == 44) {
         printJS({
@@ -1733,6 +1753,15 @@ export default {
           style: style12,
           scanStyles: false,
         });
+      }else if (
+        this.org_template_info.template_id == 54
+      ) {
+        printJS({
+          printable: "dialysis-print-box",
+          type: "html",
+          style: style13,
+          scanStyles: false,
+        });
       }
     },
     printThisOnePage() {

src/xt_pages/dialysis/doctorAdvicePrint.vue

@@ -258,7 +258,8 @@ export default {
             time:'',
             show:true,
             showOne:false,
-            delivery_way:""
+            delivery_way:"",
+            org_id:0,
         }
     },
     methods:{
@@ -291,36 +292,31 @@ export default {
                     this.project = resp.data.project
                     resp.data.hisAdvices.map((item,index) => {
                     item.new_advice = item.new_advice ? item.new_advice : []
-                    if(this.project[index].project.length > 0){
-                        this.project[index].project.map(it => {
-                        let obj = {
-                            advice_doctor: it.doctor,
-                            start_time:it.start_time,
-                            advice_name: it.type == 2 ? it.project.project_name : it.good_info.good_name,
-                            execution_time:it.execution_time,
-                            execution_state:it.execution_state,
-                            execution_staff:it.execution_staff,
-                            check_time:it.check_time,
-                            check_state:it.check_state,
-                            checker:it.checker,
-                            created_time:it.ctime,
-                            remark:'',
-                            id:it.id,
-                            parent_id:0,
-                            groupno:0
+                      if(this.org_id!=9671 && this.org_id!= 10318){
+                        if(this.project[index].project.length > 0){
+                            this.project[index].project.map(it => {
+                            let obj = {
+                                advice_doctor: it.doctor,
+                                start_time:it.start_time,
+                                advice_name: it.type == 2 ? it.project.project_name : it.good_info.good_name,
+                                execution_time:it.execution_time,
+                                execution_state:it.execution_state,
+                                execution_staff:it.execution_staff,
+                                check_time:it.check_time,
+                                check_state:it.check_state,
+                                checker:it.checker,
+                                created_time:it.ctime,
+                                remark:'',
+                                id:it.id,
+                                parent_id:0,
+                                groupno:0
+                            }
+                        
+                            item.doctor_advice.push(obj)
+                            })
                         }
-                        // let advice = []
-                        // advice.push(obj)
-                        // let advices = {
-                        //   advices: advice,
-                        //   group_no: 123
-                        // }
-
-                        // console.log(11111,item.new_advice)
-                        item.doctor_advice.push(obj)
-                        })
                     }
-                    })
+                   })
                 }
                 if(config.is_open == 0 || config.is_open == 2){
 
@@ -781,11 +777,11 @@ export default {
     created(){
       var time = this.$route.query.time
       var delivery_way = this.$route.query.delivery_way
-      console.log("delivery_Way",delivery_way)
       this.delivery_way = delivery_way
       this.time = moment(time).format('YYYY-MM-DD')
       console.log(11,this.$route.query)
       this.requestSchedualDoctors(time)
+      this.org_id = this.$store.getters.xt_user.template_info.org_id;
     }
 }
 </script>

src/xt_pages/dialysis/template/DialysisPrintOrderEleven.vue

@@ -495,7 +495,7 @@
                     <tbody>
                       <tr>
                         <td :colspan="prescription.mode_id == 2 || prescription.mode_id == 5 ? 12 : 11" style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 6px 8px;line-height: 30px;">
-                          治疗纪录
+                          治疗记录
                         </td>
                       </tr>
                       <tr>
@@ -1331,7 +1331,7 @@ export default {
             }
         })
         }
-        
+
         if(num == 0){
           this.$message.success('核对完成')
         }

src/xt_pages/dialysis/template/DialysisPrintOrderFifty.vue

@@ -1160,7 +1160,7 @@
                             line-height: 30px;
                           "
                         >
-                          治疗纪录
+                          治疗记录
                         </td>
                       </tr>
                       <tr>

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyOne.vue

@@ -50,7 +50,7 @@
             病区：
             <div class="under_line" style="width: 50px;text-align: center;">
               <span>{{ patientInfo.DialysisSchedule.device_zone.name ? patientInfo.DialysisSchedule.device_zone.name : '' }}</span>
-              
+
             </div>
           </div>
           <div class="inline_block">
@@ -532,7 +532,7 @@
                     <tbody>
                       <tr>
                         <td :colspan="prescription.mode_id == 2 || prescription.mode_id == 5 ? 14 : 13" style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 6px 8px;line-height: 30px;">
-                          治疗纪录
+                          治疗记录
                         </td>
                       </tr>
                       <tr>
@@ -594,9 +594,9 @@
                         <!-- SPO2 -->
                         <td >{{ monitor.blood_oxygen_saturation ? monitor.blood_oxygen_saturation : "" }}</td>
                         <td>{{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "" }}</td>
-                        
+
                         <td>{{ monitor.conductivity ? monitor.conductivity : "" }}</td>
-                        
+
                         <td v-if="(dialysisOrder && monitor.operate_time > dialysisOrder.end_time) || (dialysisOrder && monitor.operate_time < dialysisOrder.start_time)">
                           {{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}
                         </td>
@@ -869,14 +869,14 @@
                     <span>{{ advice.advice_name }}</span>
 
                     <span v-if="advice && advice.advice_desc">({{ advice.advice_desc }}{{ advice.drug_spec_unit }})</span>
-                    
+
                     <span v-if="advice.prescribing_number">&nbsp;&nbsp; {{ advice.prescribing_number }}{{ advice.prescribing_number_unit }}</span>
-                    
+
                     <span v-if="advice.single_dose != 0">{{ advice.single_dose }}{{ advice.single_dose_unit }}</span>
                     <span v-if="advice.parent_id == 0">{{ advice.delivery_way }}</span>
-                    
+
                     <span v-if="advice.parent_id == 0">{{ advice.execution_frequency }}</span>
-                   
+
                     <span v-if="advice.parent_id == 0 && advice.remark.length > 0">({{ advice.remark }})</span>
                   </td>
                   <!-- <td colspan="2" height="60px" style="text-align: center" v-else >

src/xt_pages/dialysis/template/DialysisPrintOrderFortyNine.vue

@@ -521,7 +521,7 @@
                     <tbody>
                       <tr>
                         <td :colspan="prescription.mode_id == 2 || prescription.mode_id == 5 ? 12 : 11" style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 6px 8px;line-height: 30px;">
-                          治疗纪录
+                          治疗记录
                         </td>
                       </tr>
                       <tr>

src/xt_pages/dialysis/template/DialysisPrintOrderFortySeven.vue

@@ -754,7 +754,13 @@
                             ? prescription.dialyzer_perfusion_apparatus
                             : ""
                         }}
-                        <span v-if="!prescription.dialysis_dialyszers&&!prescription.dialyzer_perfusion_apparatus">/</span>
+                        <span
+                          v-if="
+                            !prescription.dialysis_dialyszers &&
+                            !prescription.dialyzer_perfusion_apparatus
+                          "
+                          >/</span
+                        >
                         <span v-if="prescription.dialysis_dialyszers">/</span>
                         {{
                           prescription.dialysis_dialyszers
@@ -816,10 +822,10 @@
                         class="under_line"
                         style="width: 100px; text-align: center"
                       >
-                        <span v-if="org_id == 10290">{{
+                        <span v-if="org_id == 10290 || org_id == 10318">{{
                           lastafterdialysis.weight_after
                         }}</span>
-                        <span v-else>{{
+                        <span v-if="org_id != 10290 && org_id != 10318">{{
                           predialysis.weight_after_last_transparency
                             ? predialysis.weight_after_last_transparency
                             : "未称重"
@@ -1139,7 +1145,7 @@
                             line-height: 30px;
                           "
                         >
-                          治疗纪录
+                          治疗记录
                         </td>
                       </tr>
                       <tr>
@@ -1289,7 +1295,6 @@
                                 : ""
                             }}
                           </span>
-                          
                         </td>
                         <!-- <td
                           v-if="
@@ -1445,19 +1450,20 @@
                           style="padding-left: 7px"
                         >
                           <span v-if="advice.parent_id > 0">---></span>
-                          <span>{{ advice.advice_name }}</span>
+                          <span v-if="advice.advice_name">{{ advice.advice_name }}</span>
+                          <span v-else-if="advice.project && advice.project.project_name">{{ advice.project.project_name }}</span>
+
                           <span v-if="advice && advice.advice_desc"
                             >({{ advice.advice_desc
                             }}{{ advice.drug_spec_unit }})</span
                           >
-                          <span v-if="advice.prescribing_number"
-                            >&nbsp;&nbsp; {{ advice.prescribing_number
-                            }}{{ advice.prescribing_number_unit }}</span
-                          >
+                          
+                         
                           <span v-if="advice.single_dose != 0"
                             >{{ advice.single_dose
                             }}{{ advice.single_dose_unit }}</span
                           >
+                          <span v-if="advice && advice.project">{{advice.project.unit}}</span>
                           <span v-if="advice.parent_id == 0">{{
                             advice.delivery_way
                           }}</span>
@@ -1477,11 +1483,11 @@
                       <span v-if="advice.remark.length > 0">({{advice.remark}})</span>
                     </td> -->
                         <!-- <td width="10%" v-if="(advice.children && advice.children.length > 0 || advice.parent_id > 0) && advice.isShow == 2" ></td> -->
-                        <td height="32px">
+                        <td height="32px" v-if="advice.advice_doctor">
                           <span
                             v-if="setAdminUserES(advice.advice_doctor) == ''"
                             >{{ getAdminUser(advice.advice_doctor) }}</span
-                          >
+                          >  
                           <img
                             style="height: 30px"
                             :src="setAdminUserES(advice.advice_doctor)"
@@ -1490,6 +1496,19 @@
                             v-else
                           />
                         </td>
+                        <td v-else>
+                            <span
+                            v-if="setAdminUserES(advice.doctor) == ''"
+                            >{{ getAdminUser(advice.doctor) }}</span
+                          >
+                          <img
+                            style="height: 30px"
+                            :src="setAdminUserES(advice.doctor)"
+                            alt=""
+                            srcset=""
+                            
+                          />
+                        </td>
                         <!-- <td height="35px">
                       <span v-if="setAdminUserES(advice.checker) == ''">{{getAdminUser(advice.checker)}}</span>
                       <img style="height:20px;" :src="setAdminUserES(advice.checker)" alt="" srcset="" v-else>
@@ -2601,7 +2620,7 @@ export default {
       summary: {},
       receiverTreatmentAccess: {},
       org_template_info: {},
-
+      project:[],
       doctor_advices: [],
       doctor_advices_2: [],
       advice_groups: [],
@@ -3083,6 +3102,14 @@ export default {
 
         this.prescription = response.data.data.dialysisPrescription;
         console.log("透析处方", this.prescription);
+        let project_arr = response.data.data.projects
+        project_arr.forEach(o => {
+          if(o.project.project_name && o.project.project_name!=""){
+            this.project.push(o)
+          }
+        });
+        // this.project = response.data.data.projects;
+        console.log(this.project, "项目和耗材");
         this.receiverTreatmentAccess =
           response.data.data.receiverTreatmentAccess;
         this.prescription.mode = this.modeName(this.prescription.mode_id);
@@ -3229,7 +3256,9 @@ export default {
         }
         this.loading = false;
         this.doctor_advices =
-          response.data.data.advices == null ? [] : response.data.data.advices;
+          response.data.data.advices == null ? [] : response.data.data.advices.concat(this.project);
+          // .concat(this.project)
+          console.log( this.doctor_advices,' this.doctor_advices this.doctor_advices')
         for (let index = 0; index < this.doctor_advices.length; index++) {
           this.doctor_advices[index]["isShow"] = 2;
         }
@@ -3328,23 +3357,23 @@ export default {
           }
         }
 
-        this.totollength = this.doctor_advices.length + this.monitors.length;
-        if (this.totollength > 18) {
-          var temp_advice_length = 17 - this.monitors.length;
-          var doctor_advices_1 = [];
-          var doctor_advices_2 = [];
-          for (let index = 0; index < this.doctor_advices.length; index++) {
-            const element = this.doctor_advices[index];
-            if (temp_advice_length > index) {
-              doctor_advices_1.push(element);
-            } else {
-              doctor_advices_2.push(element);
-            }
-          }
-          this.doctor_advices = doctor_advices_1;
-          this.doctor_advices_2 = doctor_advices_2;
-        }
-        console.log(this.advice_groups);
+        // this.totollength = this.doctor_advices.length + this.monitors.length;
+        // if (this.totollength > 18) {
+        //   var temp_advice_length = 17 - this.monitors.length;
+        //   var doctor_advices_1 = [];
+        //   var doctor_advices_2 = [];
+        //   for (let index = 0; index < this.doctor_advices.length; index++) {
+        //     const element = this.doctor_advices[index];
+        //     if (temp_advice_length > index) {
+        //       doctor_advices_1.push(element);
+        //     } else {
+        //       doctor_advices_2.push(element);
+        //     }
+        //   }
+        //   this.doctor_advices = doctor_advices_1;
+        //   this.doctor_advices_2 = doctor_advices_2;
+        // }
+        // console.log(this.doctor_advices,'doctor_advices');
       } else {
         this.loading = false;
         this.$message.error("请求数据失败");

src/xt_pages/dialysis/template/DialysisPrintOrderFortySix.vue

@@ -1087,7 +1087,7 @@
                             line-height: 30px;
                           "
                         >
-                          治疗纪录
+                          治疗记录
                         </td>
                       </tr>
                       <tr>

src/xt_pages/dialysis/template/DialysisPrintOrderFour.vue

@@ -616,7 +616,7 @@
               <td width="80">透析液温度<br/>℃</td>
               <td width="60">置换率<br/>ml/min</td> -->
 
-              <td width="">病情特殊处理<br/>及专科护理措施纪录</td>
+              <td width="">病情特殊处理<br/>及专科护理措施记录</td>
               <td width="80">护士签名</td>
             </tr>
 

src/xt_pages/dialysis/template/DialysisPrintOrderNineteen.vue

@@ -490,7 +490,7 @@
                   <tbody>
                     <tr>
                       <td :colspan="prescription.mode_id == 2 || prescription.mode_id == 5 ? 12 : 11" style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 6px 8px;line-height: 30px;">
-                        治疗纪录
+                        治疗记录
                       </td>
                     </tr>
                     <tr>
@@ -1346,7 +1346,7 @@ export default {
           response.data.data.dialysisOrder === null
             ? null
             : response.data.data.dialysisOrder;
-        
+
         if (this.operators.length > 0) {
           var operatorsLen = this.operators.length;
           for (var index = 0; index < operatorsLen; index++) {
@@ -1487,7 +1487,7 @@ export default {
                     this.monitors[index].end = "【结束透析】";
                   }
               }
-            
+
           }
         }
 

src/xt_pages/dialysis/template/DialysisPrintOrderTen.vue

@@ -487,7 +487,7 @@
                     <tbody>
                       <tr>
                         <td :colspan="prescription.mode_id == 2 || prescription.mode_id == 5 ? 12 : 11" style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 6px 8px;line-height: 30px;">
-                          治疗纪录
+                          治疗记录
                         </td>
                       </tr>
                       <tr>
@@ -1015,7 +1015,7 @@
                       治疗医生：
                       <div class="under_line" style="width: 80px">
                         <!-- <img style="height:20px;" src="https://images.shengws.com/FgnRnBcx1BgULJ1dn7VKzeBPEvtm" alt="" srcset="" /> -->
-                       
+
                         <span v-if="setAdminUserES(prescription.prescription_doctor) == ''">{{ getAdminUser(prescription.prescription_doctor) }}</span>
                         <img style="height:20px;" :src="setAdminUserES(prescription.prescription_doctor)" alt="" srcset="" v-else />
                       </div>
@@ -1332,7 +1332,7 @@ export default {
             }
         })
         }
-        
+
         if(num == 0){
           this.$message.success('核对完成')
         }

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyOne.vue

@@ -304,6 +304,7 @@
           出血
           <div class="inline_block under_line" style="width:150px;text-align: center;margin-right:30px;">
             <span v-if="predialysis.is_hemorrhage == 1">{{ predialysis.is_hemorrhage == 1 && predialysis.hemorrhage ? predialysis.hemorrhage : "" }}</span>
+            <span v-if="predialysis.is_hemorrhage == 1">{{ predialysis.is_hemorrhage == 1 && predialysis.hemorrhage_other ? predialysis.hemorrhage_other : "" }}</span>
             <span v-if="predialysis.is_hemorrhage == 2">无</span>
             <span v-if="predialysis.is_hemorrhage != 2 && predialysis.is_hemorrhage != 1">/</span>
           </div>
@@ -416,13 +417,13 @@
                 <td style="height:40px;line-height:40px">&nbsp;
                   {{getTime(monitor.operate_time,'{h}:{i}')}}
                 </td>
-                <td>&nbsp;{{monitor.systolic_blood_pressure?monitor.systolic_blood_pressure:''}} /
+                <td>&nbsp;{{monitor.systolic_blood_pressure?monitor.systolic_blood_pressure:''}} <span v-if="monitor.systolic_blood_pressure||monitor.diastolic_blood_pressure">/</span>
                   {{monitor.diastolic_blood_pressure?monitor.diastolic_blood_pressure:''}}
                 </td>
                 <td>&nbsp;{{monitor.pulse_frequency?monitor.pulse_frequency:''}}</td>
                 <td>&nbsp;{{monitor.blood_flow_volume?monitor.blood_flow_volume:''}}</td>
-                <td>&nbsp;{{monitor.venous_pressure?monitor.venous_pressure:''}}/{{ monitor.arterial_pressure ? monitor.arterial_pressure : "" }}</td>
-                <td>&nbsp;{{monitor.ultrafiltration_volume?monitor.ultrafiltration_volume:''}}</td>
+                <td>&nbsp;{{monitor.venous_pressure?monitor.venous_pressure:''}}<span v-if="monitor.venous_pressure||monitor.arterial_pressure">/</span>{{ monitor.arterial_pressure ? monitor.arterial_pressure : "" }}</td>
+                <td>&nbsp;{{monitor.ultrafiltration_volume==0 && monitor.id?'0':monitor.ultrafiltration_volume}}</td>
                 <td>&nbsp;{{monitor.transmembrane_pressure?monitor.transmembrane_pressure:''}}</td>
                 <td>&nbsp;{{monitor.conductivity?monitor.conductivity:''}}</td>
                 <td>&nbsp;{{monitor.dialysate_temperature ? monitor.dialysate_temperature : ''}}</td>

src/xt_pages/dialysis/template/DialysisPrintOrderThree.vue

@@ -572,7 +572,7 @@
             <!--<td width="80">透析液温度<br/>℃</td>
               <td width="60">置换率<br/>ml/min</td> -->
 
-            <td width="">病情特殊处理<br />及专科护理措施纪录</td>
+            <td width="">病情特殊处理<br />及专科护理措施记录</td>
             <td width="60">护士签名</td>
           </tr>
 

src/xt_pages/dialysis/template/dialysisPrintOrderFive.vue

@@ -146,7 +146,7 @@
                       {{ predialysis.internal_fistula_other }}
                     </div>
                   </div>
-                </div>  
+                </div>
                 <div class="row" style="padding: 2px 0;line-height:19px;">
                   <div class="inline_block">
                     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -508,7 +508,7 @@
                       <td width="80">血流量<br />ml/min</td>
                       <td width="90" v-if="org_id!=10210">超滤量累计L</td>
                       <td width="90" v-else>超滤量累计ml</td>
-                 
+
                       <td width="90">置换液流量ml/h</td>
                       <td width="80">钠浓度<br />mmol/L</td>
                       <td width="240">
@@ -1125,7 +1125,7 @@
             </tr>
           </template>
           <!-- <tr v-if="this.advice_groups_2.length == 0">
-            <td colspan="7" style="text-align:left;">特殊纪录：</td>
+            <td colspan="7" style="text-align:left;">特殊记录：</td>
         </tr> -->
         </tbody>
         <div class="print-yema4">1</div>
@@ -1238,7 +1238,7 @@
                 </tr>
               </template>
               <!-- <tr >
-                <td colspan="7" style="text-align:left;">特殊纪录：</td>
+                <td colspan="7" style="text-align:left;">特殊记录：</td>
             </tr> -->
             </tbody>
           </table>

src/xt_pages/hospitalStation/components/chargeDialog.vue

@@ -216,7 +216,7 @@
           // {value: 2, label: '银行卡'},
           // {value: 3, label: '微信'},
           // {value: 4, label: '支付宝'},
-          { value: 4, label: '医保卡' },
+          { value: 5, label: '医保卡' },
 
         ],
         total: "",

src/xt_pages/hospitalStation/components/prescriptionTable.vue

@@ -335,7 +335,7 @@
         })
 
       }, deleteDrug: function(index, row) {
-        if (this.prescription.order_status == 2) {
+        if (this.prescription.order_status == 2  || this.prescription.order_status == 4) {
           this.$message.error('该处方已经结算，无法删除')
           return
         }
@@ -407,7 +407,7 @@
         return name
       },
       deleteProject(row, i) {
-        if (this.prescription.order_status == 2) {
+        if (this.prescription.order_status == 2 || this.prescription.order_status == 4) {
           this.$message.error('该处方已经结算，无法删除')
           return
         }

src/xt_pages/hospitalStation/invoicePrint.vue

@@ -15,13 +15,20 @@
       <div class="dialysisPage">
         <printOne
           v-if="
-            org_id != 10215 && org_id != 10265 && org_id != 4 && org_id != 0 && org_id != 9675
+            org_id != 10215 &&
+            org_id != 10265 &&
+            org_id != 4 &&
+            org_id != 0 &&
+            org_id != 9675
           "
           :paramsObj="invoiceParams"
         ></printOne>
-        <printTwo v-if="org_id == 10215 " :paramsObj="invoiceParams"></printTwo>
+        <printTwo
+          v-if="org_id == 10215 || org_id == 0"
+          :paramsObj="invoiceParams"
+        ></printTwo>
         <printThree
-          v-if="org_id == 10265 || org_id == 4 || org_id == 9675 ||  org_id == 0"
+          v-if="org_id == 10265 || org_id == 4 || org_id == 9675"
           :paramsObj="invoiceParams"
         ></printThree>
       </div>

src/xt_pages/hospitalStation/invoiceTemplate/printThree.vue

@@ -197,7 +197,7 @@
         </div>
         <div style="position: absolute;top:370px;left:480px">
             <!-- 应退款 -->
-            应退款:{{list.refund_sum}}
+            应退款:{{parseFloat(pre_pay_money)}}
         </div>
         <div>
             <div style="position: absolute;top:400px;left:40px">

src/xt_pages/hospitalStation/invoiceTemplate/printTwo.vue

@@ -1,282 +1,456 @@
 <template>
-    <div id='invoice-print' style="font-size:12px;">
-        <div style="display:flex;">
-            <div style="position: absolute;top:50px;left:60px;">{{ list.order_number }}</div>
-            <!-- <div>{{ list.id_card_no }}</div> -->
+  <div id="invoice-print" style="font-size: 12px">
+    <div v-if="list.order_number">
+      <div style="display: flex">
+        <div style="position: absolute; top: 50px; left: 60px">
+          {{ list.order_number }}
         </div>
-        <div style="display:flex;justify-content: space-between;">
-            <!-- <div>{{ list.department_name }}</div> -->
-            <div  style="position: absolute;top:50px;left:260px">{{id_card_no?id_card_no:list.order.certno}}</div>
-            <div></div>
+        <!-- <div>{{ list.id_card_no }}</div> -->
+      </div>
+      <div style="display: flex; justify-content: space-between">
+        <!-- <div>{{ list.department_name }}</div> -->
+        <div style="position: absolute; top: 50px; left: 260px">
+          {{ id_card_no ? id_card_no : list.order.certno }}
         </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">{{ number?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>
-            <div  style="position: absolute;left:530px;top:70px;">
-                <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;left:560px;top:70px;">
-                <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>
+      <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">
+          {{ number ? number : list.order.mdtrt_id }}
         </div>
-        <div style="display:flex;justify-content: space-between;">
-            <div style="position: absolute;top:85px;left:100px;"> {{ paramsObj.name }}</div>
-            <div style="position: absolute;top:85px;left:180px;">√</div>
-            <!-- <div>{{ list.pay_way }}</div> -->
-            <div style="position: absolute;top:85px;left:380px;">{{ in_hosptial_time }}</div>
-            <div style="position: absolute;top:85px;left:530px;">{{ out_hosptial_time }}</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>
-        <div style="display:flex;justify-content: space-between;">
-            <!-- <div>{{ paramsObj.gend == 1 ? '男' : '女' }}</div> -->
-            <div v-if=" gend == 1" style="position: absolute;top:110px;left:100px;">√</div>
-            <div v-else style="position: absolute;top:110px;left:140px;">√</div>
-
-            <div style="position: absolute;top:110px;left:260px;">{{balance_accounts_type != 2 ?  list.order.fund_pay_sumamt : '0.00' }}</div>
-            <div style="position: absolute;top:110px;left:420px;">{{balance_accounts_type != 2 ? list.order.psn_cash_pay : list.order.medfee_sumamt}}</div>
-            <div style="position: absolute;top:110px;left:540px;">现金</div>
+        <div style="position: absolute; left: 530px; top: 70px">
+          <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; left: 560px; top: 70px">
+          <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 style="display:flex;justify-content: space-between;">
-            <div style="position: absolute;top:145px;left:50px">西药</div>
-            <div style="position: absolute;top:145px;left:130px">{{ list.westernMedicineCostTotal ? list.westernMedicineCostTotal.toFixed(2) : '' }}</div>
-            <div style="position: absolute;top:145px;left:180px">检查费</div>
-            <div style="position: absolute;top:145px;left:260px">{{ list.checkCostTotal ? list.checkCostTotal.toFixed(2) : '' }}</div>
-            <div style="position: absolute;top:145px;left:340px">治疗费</div>
-            <div style="position: absolute;top:145px;left:420px">{{ list.treatCostTotal ? list.treatCostTotal.toFixed(2) : '' }}</div>
-            <div style="position: absolute;top:145px;left:480px">床位费</div>
-            <div style="position: absolute;top:145px;left:540px">{{ list.bedCostTotal ? list.bedCostTotal.toFixed(2) : '' }}</div>
+      </div>
+      <div style="display: flex; justify-content: space-between">
+        <div style="position: absolute; top: 85px; left: 100px">
+          {{ paramsObj.name }}
         </div>
-        <div style="display:flex;justify-content: space-between;">
-            <div style="position: absolute;top:170px;left:50px">中成药</div>
-            <div style="position: absolute;top:170px;left:130px">{{ list.chineseTraditionalMedicineCostTotal ? list.chineseTraditionalMedicineCostTotal.toFixed(2) : '' }}</div>
-            <div style="position: absolute;top:170px;left:180px">化验费</div>
-            <div style="position: absolute;top:170px;left:260px">{{ list.laboratoryCostTotal ? list.laboratoryCostTotal.toFixed(2) : '' }}</div>
-            <div style="position: absolute;top:170px;left:340px">手术费</div>
-            <div style="position: absolute;top:170px;left:420px">{{ list.operationCostTotal ? list.operationCostTotal.toFixed(2) : '' }}</div>
-            <div style="position: absolute;top:170px;left:480px">其他费</div>
-            <div style="position: absolute;top:170px;left:540px">{{ list.otherCostTotal ? list.otherCostTotal.toFixed(2) : '' }}</div>
+        <div style="position: absolute; top: 85px; left: 180px">√</div>
+        <!-- <div>{{ list.pay_way }}</div> -->
+        <div style="position: absolute; top: 85px; left: 380px">
+          {{ in_hosptial_time }}
         </div>
-        <div style="display:flex;justify-content: space-between;">
-            <div style="position: absolute;top:190px;left:50px"></div>
-            <div style="position: absolute;top:190px;left:130px"></div>
-            <div style="position: absolute;top:190px;left:180px"></div>
-            <div style="position: absolute;top:190px;left:260px"></div>
-            <div style="position: absolute;top:190px;left:340px">材料费</div>
-            <div style="position: absolute;top:190px;left:420px">{{ list.materialCostTotal ? list.materialCostTotal.toFixed(2) : '' }}</div>
-            <div style="position: absolute;top:190px;left:480px">诊察费</div>
-            <div style="position: absolute;top:190px;left:540px">{{ list.zhenChaCostTotal ? list.zhenChaCostTotal.toFixed(2) : '' }}</div>
+        <div style="position: absolute; top: 85px; left: 530px">
+          {{ out_hosptial_time }}
         </div>
-        <div style="display:flex;justify-content: space-between;">
-            <div style="position: absolute;top:210px;left:50px"></div>
-            <div style="position: absolute;top:210px;left:130px"></div>
-            <div style="position: absolute;top:210px;left:180px"></div>
-            <div style="position: absolute;top:210px;left:260px" v-if="balance_accounts_type != 2">{{ list.psn_cash_money ? list.psn_cash_money.toFixed(2) : '' }}</div>
-          <div style="position: absolute;top:210px;left:260px" v-else>{{ list.order.medfee_sumamt ? list.order.medfee_sumamt : '' }}</div>
+      </div>
+      <div style="display: flex; justify-content: space-between">
+        <!-- <div>{{ paramsObj.gend == 1 ? '男' : '女' }}</div> -->
+        <div
+          v-if="gend == 1"
+          style="position: absolute; top: 110px; left: 100px"
+        >
+          √
+        </div>
+        <div v-else style="position: absolute; top: 110px; left: 140px">√</div>
 
-          <div style="position: absolute;top:210px;left:340px"></div>
-            <div style="position: absolute;top:210px;left:420px"></div>
-            <div style="position: absolute;top:210px;left:480px"></div>
-            <div style="position: absolute;top:210px;left:540px"></div>
+        <div style="position: absolute; top: 110px; left: 260px">
+          {{ balance_accounts_type != 2 ? list.order.fund_pay_sumamt : "0.00" }}
         </div>
-        <div>
-            <span>
-            <span  style="position: absolute;top:235px;left:190px">
-                <span v-if="zhongwen.indexOf('万') > -1 && zhongwen.indexOf('拾') > -1 && zhongwen.indexOf('拾') == 1">
-                    {{ zhongwen.substring(0,1) }}
-                </span>
-                <span v-else>零</span>
-            </span>
-            <span  style="position: absolute;top:235px;left:220px">
-                <span v-if="zhongwen.indexOf('万') > -1">
-                    {{ zhongwen.substring(zhongwen.indexOf('万') - 1,zhongwen.indexOf('万')) }}
-                </span>
-                <span v-else>零</span>
+        <div style="position: absolute; top: 110px; left: 420px">
+          {{
+            balance_accounts_type != 2
+              ? list.order.psn_cash_pay
+              : list.order.medfee_sumamt
+          }}
+        </div>
+        <div style="position: absolute; top: 110px; left: 540px">现金</div>
+      </div>
+      <div style="display: flex; justify-content: space-between">
+        <div style="position: absolute; top: 145px; left: 50px">西药</div>
+        <div style="position: absolute; top: 145px; left: 130px">
+          {{
+            list.westernMedicineCostTotal
+              ? list.westernMedicineCostTotal.toFixed(2)
+              : ""
+          }}
+        </div>
+        <div style="position: absolute; top: 145px; left: 180px">检查费</div>
+        <div style="position: absolute; top: 145px; left: 260px">
+          {{ list.checkCostTotal ? list.checkCostTotal.toFixed(2) : "" }}
+        </div>
+        <div style="position: absolute; top: 145px; left: 340px">治疗费</div>
+        <div style="position: absolute; top: 145px; left: 420px">
+          {{ list.treatCostTotal ? list.treatCostTotal.toFixed(2) : "" }}
+        </div>
+        <div style="position: absolute; top: 145px; left: 480px">床位费</div>
+        <div style="position: absolute; top: 145px; left: 540px">
+          {{ list.bedCostTotal ? list.bedCostTotal.toFixed(2) : "" }}
+        </div>
+      </div>
+      <div style="display: flex; justify-content: space-between">
+        <div style="position: absolute; top: 170px; left: 50px">中成药</div>
+        <div style="position: absolute; top: 170px; left: 130px">
+          {{
+            list.chineseTraditionalMedicineCostTotal
+              ? list.chineseTraditionalMedicineCostTotal.toFixed(2)
+              : ""
+          }}
+        </div>
+        <div style="position: absolute; top: 170px; left: 180px">化验费</div>
+        <div style="position: absolute; top: 170px; left: 260px">
+          {{
+            list.laboratoryCostTotal ? list.laboratoryCostTotal.toFixed(2) : ""
+          }}
+        </div>
+        <div style="position: absolute; top: 170px; left: 340px">手术费</div>
+        <div style="position: absolute; top: 170px; left: 420px">
+          {{
+            list.operationCostTotal ? list.operationCostTotal.toFixed(2) : ""
+          }}
+        </div>
+        <div style="position: absolute; top: 170px; left: 480px">其他费</div>
+        <div style="position: absolute; top: 170px; left: 540px">
+          {{ list.otherCostTotal ? list.otherCostTotal.toFixed(2) : "" }}
+        </div>
+      </div>
+      <div style="display: flex; justify-content: space-between">
+        <div style="position: absolute; top: 190px; left: 50px"></div>
+        <div style="position: absolute; top: 190px; left: 130px"></div>
+        <div style="position: absolute; top: 190px; left: 180px"></div>
+        <div style="position: absolute; top: 190px; left: 260px"></div>
+        <div style="position: absolute; top: 190px; left: 340px">材料费</div>
+        <div style="position: absolute; top: 190px; left: 420px">
+          {{ list.materialCostTotal ? list.materialCostTotal.toFixed(2) : "" }}
+        </div>
+        <div style="position: absolute; top: 190px; left: 480px">诊察费</div>
+        <div style="position: absolute; top: 190px; left: 540px">
+          {{ list.zhenChaCostTotal ? list.zhenChaCostTotal.toFixed(2) : "" }}
+        </div>
+      </div>
+      <div style="display: flex; justify-content: space-between">
+        <div style="position: absolute; top: 210px; left: 50px"></div>
+        <div style="position: absolute; top: 210px; left: 130px"></div>
+        <div style="position: absolute; top: 210px; left: 180px"></div>
+        <div
+          style="position: absolute; top: 210px; left: 260px"
+          v-if="balance_accounts_type != 2"
+        >
+          {{ list.psn_cash_money ? list.psn_cash_money.toFixed(2) : "" }}
+        </div>
+        <div style="position: absolute; top: 210px; left: 260px" v-else>
+          {{ list.order.medfee_sumamt ? list.order.medfee_sumamt : "" }}
+        </div>
+
+        <div style="position: absolute; top: 210px; left: 340px"></div>
+        <div style="position: absolute; top: 210px; left: 420px"></div>
+        <div style="position: absolute; top: 210px; left: 480px"></div>
+        <div style="position: absolute; top: 210px; left: 540px"></div>
+      </div>
+      <div>
+        <span>
+          <span style="position: absolute; top: 235px; left: 190px">
+            <span
+              v-if="
+                zhongwen.indexOf('万') > -1 &&
+                zhongwen.indexOf('拾') > -1 &&
+                zhongwen.indexOf('拾') == 1
+              "
+            >
+              {{ zhongwen.substring(0, 1) }}
             </span>
-            <span  style="position: absolute;top:235px;left:250px">
-                <span v-if="zhongwen.indexOf('仟') > -1">
-                    {{ zhongwen.substring(zhongwen.indexOf('仟') - 1,zhongwen.indexOf('仟')) }}
-                </span>
-                <span v-else>零</span>
+            <span v-else>零</span>
+          </span>
+          <span style="position: absolute; top: 235px; left: 220px">
+            <span v-if="zhongwen.indexOf('万') > -1">
+              {{
+                zhongwen.substring(
+                  zhongwen.indexOf("万") - 1,
+                  zhongwen.indexOf("万")
+                )
+              }}
             </span>
-            <span  style="position: absolute;top:235px;left:290px">
-                <span v-if="zhongwen.indexOf('佰') > -1">
-                    {{ zhongwen.substring(zhongwen.indexOf('佰') - 1,zhongwen.indexOf('佰')) }}
-                </span>
-                <span v-else>零</span>
+            <span v-else>零</span>
+          </span>
+          <span style="position: absolute; top: 235px; left: 250px">
+            <span v-if="zhongwen.indexOf('仟') > -1">
+              {{
+                zhongwen.substring(
+                  zhongwen.indexOf("仟") - 1,
+                  zhongwen.indexOf("仟")
+                )
+              }}
             </span>
-            <span style="position: absolute;top:235px;left:320px">
-                <span v-if="zhongwen.indexOf('拾') > -1">
-                    {{zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) == '佰' ||  !zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾'))? '壹' : zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) }}
-                </span>
-                <span v-else>零</span>
+            <span v-else>零</span>
+          </span>
+          <span style="position: absolute; top: 235px; left: 290px">
+            <span v-if="zhongwen.indexOf('佰') > -1">
+              {{
+                zhongwen.substring(
+                  zhongwen.indexOf("佰") - 1,
+                  zhongwen.indexOf("佰")
+                )
+              }}
             </span>
-            <span  style="position: absolute;top:235px;left:350px">
-                <span v-if="zhongwen.indexOf('元') > -1 && zhongwen.substring(this.zhongwen.indexOf('元') - 1).substring(0,1)!= '拾'">
-                    {{ zhongwen.substring(zhongwen.indexOf('元') - 1,zhongwen.indexOf('元')) }}
-                </span>
-                <span v-else>零</span>
+            <span v-else>零</span>
+          </span>
+          <span style="position: absolute; top: 235px; left: 320px">
+            <span v-if="zhongwen.indexOf('拾') > -1">
+              {{
+                zhongwen.substring(
+                  zhongwen.indexOf("拾") - 1,
+                  zhongwen.indexOf("拾")
+                ) == "佰" ||
+                !zhongwen.substring(
+                  zhongwen.indexOf("拾") - 1,
+                  zhongwen.indexOf("拾")
+                ) ||
+                zhongwen.substring(
+                  zhongwen.indexOf("拾") - 1,
+                  zhongwen.indexOf("拾")
+                ) == "零"
+                  ? "壹"
+                  : zhongwen.substring(
+                      zhongwen.indexOf("拾") - 1,
+                      zhongwen.indexOf("拾")
+                    )
+              }}
             </span>
-            <span  style="position: absolute;top:235px;left:380px">
-                <span v-if="zhongwen.indexOf('角') > -1">
-                    {{ zhongwen.substring(zhongwen.indexOf('角') - 1,zhongwen.indexOf('角')) }}
-                </span>
-                <span v-else>零</span>
+            <span v-else>零</span>
+          </span>
+          <span style="position: absolute; top: 235px; left: 350px">
+            <span
+              v-if="
+                zhongwen.indexOf('元') > -1 &&
+                zhongwen
+                  .substring(this.zhongwen.indexOf('元') - 1)
+                  .substring(0, 1) != '拾' &&
+                zhongwen
+                  .substring(this.zhongwen.indexOf('元') - 1)
+                  .substring(0, 1) != '佰'
+              "
+            >
+              {{
+                zhongwen.substring(
+                  zhongwen.indexOf("元") - 1,
+                  zhongwen.indexOf("元")
+                )
+              }}
             </span>
-            <span  style="position: absolute;top:235px;left:415px">
-                <span v-if="zhongwen.indexOf('分') > -1">
-                    {{ zhongwen.substring(zhongwen.indexOf('分') - 1,zhongwen.indexOf('分')) }}
-                </span>
-                <span v-else>零</span>
+            <span v-else>零</span>
+          </span>
+          <span style="position: absolute; top: 235px; left: 380px">
+            <span v-if="zhongwen.indexOf('角') > -1">
+              {{
+                zhongwen.substring(
+                  zhongwen.indexOf("角") - 1,
+                  zhongwen.indexOf("角")
+                )
+              }}
             </span>
+            <span v-else>零</span>
+          </span>
+          <span style="position: absolute; top: 235px; left: 415px">
+            <span v-if="zhongwen.indexOf('分') > -1">
+              {{
+                zhongwen.substring(
+                  zhongwen.indexOf("分") - 1,
+                  zhongwen.indexOf("分")
+                )
+              }}
             </span>
-            <span style="position: absolute;top:235px;left:500px">{{ totalPrice.toFixed(2) }}</span>
-        </div>
-        <!-- <div style="position: absolute;top:300px;left:460px">现金：{{ list.psn_cash_money }}</div> -->
-        <div>
-            <div style="position: absolute;top:300px;left:120px">{{ org_name }}</div>
-            <div style="position: absolute;top:300px;left:460px">高慧裕</div>
+            <span v-else>零</span>
+          </span>
+        </span>
+        <span style="position: absolute; top: 235px; left: 500px">{{
+          totalPrice.toFixed(2)
+        }}</span>
+      </div>
+      <!-- <div style="position: absolute;top:300px;left:460px">现金：{{ list.psn_cash_money }}</div> -->
+      <div>
+        <div style="position: absolute; top: 300px; left: 120px">
+          {{ org_name }}
         </div>
+        <div style="position: absolute; top: 300px; left: 460px">高慧裕</div>
+      </div>
     </div>
+  </div>
 </template>
 
 
 <script>
-import { getInvoice } from '@/api/project/project'
-import { uParseTime } from '@/utils/tools'
+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:'',
-            in_hosptial_time:'',
-            out_hosptial_time:'',
-            id_card_no:'',
-           number:'',
-          balance_accounts_type:"",
-          gend:"",
+  props: {
+    paramsObj: Object,
+  },
+  data() {
+    return {
+      list: {},
+      printDate: "",
+      zhongwen: "",
+      totalPrice: 0.0,
+      org_id: "",
+      org_name: "",
+      in_hosptial_time: "",
+      out_hosptial_time: "",
+      id_card_no: "",
+      number: "",
+      balance_accounts_type: "",
+      gend: "",
+      loading: true,
+    };
+  },
+  created() {
+    console.log("paramsObj", this.paramsObj);
+    let params = {
+      order_id: this.paramsObj.order_id,
+      patient_id: this.paramsObj.patient_id,
+    };
+    this.$nextTick(() => {
+      this.getInvoice(params);
+    })
+    
+    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) => {
+        this.$nextTick(() => {
+          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 +
+            this.list.zhenChaCostTotal;
+          this.smalltoBIG(this.list.order.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;
+          if (this.list.his.id > 0) {
+            this.in_hosptial_time = this.getTime();
+            this.out_hosptial_time = this.list.order.setl_time.split(" ")[0];
+          } else {
+            this.in_hosptial_time =
+              this.list.his_hospital_record.in_hosptial_time.split(" ")[0];
+            this.out_hosptial_time =
+              this.list.his_hospital_record.out_hosptial_time.split(" ")[0];
+          }
 
-        }
-    },
-    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
+          this.id_card_no = this.list.his_hospital_record.id_card_no;
+          this.number = this.list.his_hospital_record.number;
+          this.balance_accounts_type =
+            this.list.his_hospital_record.balance_accounts_type;
+          this.gend = this.list.his_hospital_record.gend;
+          this.loading = false;  
+        })                                                                                                    
+      });
+     
     },
-    methods:{
-        getInvoice(params){
-            getInvoice(params).then((res) => {
-                // console.log('res',res)
-                this.list = res.data.data
-                console.log('res',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.list.zhenChaCostTotal
-                this.smalltoBIG(this.list.order.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;
-                if(this.list.his.id > 0){
-                  this.in_hosptial_time = this.getTime()
-                  this.out_hosptial_time = this.list.order.setl_time.split(' ')[0]
-                }else{
-                  this.in_hosptial_time = this.list.his_hospital_record.in_hosptial_time.split(' ')[0]
-                  this.out_hosptial_time = this.list.his_hospital_record.out_hosptial_time.split(' ')[0]
-                }
-
-              this.id_card_no = this.list.his_hospital_record.id_card_no
-              this.number = this.list.his_hospital_record.number
-              this.balance_accounts_type = this.list.his_hospital_record.balance_accounts_type
-              this.gend= this.list.his_hospital_record.gend
-            })
-        },
-        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
-            }
+    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 unit = "仟佰拾亿仟佰拾万仟佰拾元角分",
+        str = "";
+      n += "00";
 
-            var indexpoint = n.indexOf('.');  // 如果是小数，截取小数点前面的位数
+      var indexpoint = n.indexOf("."); // 如果是小数，截取小数点前面的位数
 
-            if (indexpoint >= 0){
+      if (indexpoint >= 0) {
+        n = n.substring(0, indexpoint) + n.substr(indexpoint + 1, 2); // 若为小数，截取需要使用的unit单位
+      }
 
-                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); //遍历转化为大写的数字
+      }
 
-            unit = unit.substr(unit.length - n.length);  // 若为整数，截取需要使用的unit单位
-            for (var i=0; i < n.length; i++){
-                str += "零壹贰叁肆伍陆柒捌玖".charAt(n.charAt(i)) + unit.charAt(i);  //遍历转化为大写的数字
-            }
-
-            this.zhongwen =  str.replace(/零(仟|佰|拾|角)/g, "零").replace(/(零)+/g, "零").replace(/零(万|亿|元)/g, "$1").replace(/(亿)万|壹(拾)/g, "$1$2").replace(/^元零?|零分/g, "").replace(/元$/g, "元整");
-            console.log(this.zhongwen,'中文')
-            console.log(this.zhongwen.substring(this.zhongwen.indexOf('拾') - 1,this.zhongwen.indexOf('拾')),'op')
-        },
-        getTime(value, temp) {
-            if (value == 0) {
-                return ''
-            }
-            if (value != undefined) {
-                return uParseTime(value, temp)
-            }
-            return ''
-        },
+      this.zhongwen = str
+        .replace(/零(仟|佰|拾|角)/g, "零")
+        .replace(/(零)+/g, "零")
+        .replace(/零(万|亿|元)/g, "$1")
+        .replace(/(亿)万|壹(拾)/g, "$1$2")
+        .replace(/^元零?|零分/g, "")
+        .replace(/元$/g, "元整");
+      console.log(this.zhongwen, "中文");
+      console.log(
+        this.zhongwen.substring(
+          this.zhongwen.indexOf("拾") - 1,
+          this.zhongwen.indexOf("拾")
+        ),
+        "op"
+      );
     },
-    watch:{
-        paramsObj:{//深度监听，可监听到对象、数组的变化
-            handler(val, oldVal){
-                let params = {
-                    order_id: val.order_id,
-                    patient_id: val.patient_id,
-                }
-                this.getInvoice(params)
-
-            },
-            deep:true
-        }
-    }
-}
+    getTime(value, temp) {
+      if (value == 0) {
+        return "";
+      }
+      if (value != undefined) {
+        return uParseTime(value, temp);
+      }
+      return "";
+    },
+  },
+  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/hospitalStation/template/printFive.vue

@@ -18,15 +18,15 @@
           <div style="display:flex;">
             <div style="display: flex;flex-direction: column-reverse;">开具日期</div>
             <div class="underLine" style="width:60px;">
-              {{ getTime(item.ctime) ? getTime(item.ctime).split(' ')[0].slice(0, 4) : '' }}
+              {{ getTime(item.record_date) ? getTime(item.record_date).split(' ')[0].slice(0, 4) : '' }}
             </div>
             <div style="display: flex;flex-direction: column-reverse;">年</div>
             <div class="underLine" style="width:60px;">
-              {{ getTime(item.ctime) ? getTime(item.ctime).split(' ')[0].slice(5, 7) : '' }}
+              {{ getTime(item.record_date) ? getTime(item.record_date).split(' ')[0].slice(5, 7) : '' }}
             </div>
             <div style="display: flex;flex-direction: column-reverse;">月</div>
             <div class="underLine" style="width:60px;">
-              {{ getTime(item.ctime) ? getTime(item.ctime).split(' ')[0].slice(8, 11) : '' }}
+              {{ getTime(item.record_date) ? getTime(item.record_date).split(' ')[0].slice(8, 11) : '' }}
             </div>
             <div style="display: flex;flex-direction: column-reverse;">日</div>
           </div>

src/xt_pages/outpatientCharges/allListPrint.vue

@@ -13,8 +13,8 @@
     </template>
 
     <div class='dialysisPage' style="padding-top:40px;">
-      <printOne  v-if="org_id != 10215 && org_id != 0 && org_id !=9671" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printOne>
-      <summary-print v-if="org_id == 10215|| org_id == 0 || org_id ==9671" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></summary-print>
+      <printOne  v-if="org_id != 10215 && org_id != 0 && org_id !=9671&&org_id !=9675" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printOne>
+      <summary-print v-if="org_id == 10215|| org_id == 0 || org_id ==9671 ||org_id ==9675" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></summary-print>
 
 <!--      <list-print-two :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></list-print-two>-->
     </div>
@@ -358,15 +358,29 @@
 
       },
       printThisPage() {
-
         const style =
           '@media print {.allListTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.allListInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .allListTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;}.allListTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 20px;}.tableBottomOne{margin-right: 40px;}}'
+         const style1 =
+          '@media print {.allListTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.allListInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .allListTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;} .allListTable tr td {padding: 0 5px;} .allListTable .allListTable_1{border: none;width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;} .allListTable_1 tr{page-break-inside:avoid;} .allListTable_1 tr td {padding: 0 5px;border: 1px solid #000;} .tableBottom{font-size: 16px;display: flex;margin-top: 20px;}.tableBottomOne{margin-right: 40px;}}'
+        
+        if(this.org_id == 10215 || this.org_id == 0 ||this.org_id == 9675){
+          printJS({
+          printable: 'allList-print',
+          type: 'html',
+          style: style1,
+          scanStyles: false
+        })
+        }else{
         printJS({
           printable: 'allList-print',
           type: 'html',
           style: style,
           scanStyles: false
         })
+        }
+
+        
+        
 
         // if (this.org_template_info.template_id == 1) {
         //   printJS({

src/xt_pages/outpatientCharges/allListTemplate/summaryPrint.vue

@@ -1,157 +1,178 @@
 <template>
   <div id="allList-print" class="allList-print">
-    <div class="allListTitle">
-      {{ $store.getters.xt_user.org.org_name }}汇总清单
-    </div>
-    <div class="allListInfo" style="border-top: 1px solid;">
-      <div>科别：门诊</div>
-      <div>床号：</div>
-      <div>门诊号：{{ order.mdtrt_id }}</div>
-      <div>姓名：{{ patient.name }}</div>
-    </div>
-
-    <div class="allListInfo" style="border-bottom: 1px solid;">
-      <div>预交款：</div>
-      <div>总费用：{{ order.medfee_sumamt }}</div>
-      <div>门诊日期：{{ hospital.in_hosptial_time? hospital.in_hosptial_time.split(' ')[0]:''}}</div>
-    </div>
-
-    <div class="allListInfo">
-      <div>
-        西药:&nbsp;&nbsp;&nbsp;{{
-          order.westernMedicineCostTotal? order.westernMedicineCostTotal.toFixed(2)  : ""
-        }}
-      </div>
-      <div>
-        中成药:{{
-          order.chineseTraditionalMedicineCostTotal
-            ? order.chineseTraditionalMedicineCostTotal.toFixed(2)
-              : ""
-        }}
-      </div>
-      <div>中草药:</div>
-    </div>
-
-    <div class="allListInfo">
-      <div>检查费:{{ order.checkCostTotal ? order.checkCostTotal.toFixed(2)  : "" }}</div>
-      <div>输氧费:</div>
-      <div>
-        手术费:{{ order.operationCostTotal ? order.operationCostTotal.toFixed(2)  : "" }}
-      </div>
-    </div>
-
-    <div class="allListInfo">
-      <div>
-        化验费:{{ order.laboratoryCostTotal ? order.laboratoryCostTotal.toFixed(2)  : "" }}
-      </div>
-      <div>输血费:</div>
-      <div>
-        诊察费:{{ order.zhenChaCostTotal ? order.zhenChaCostTotal.toFixed(2)  : "" }}
-      </div>
-    </div>
-
-    <div class="allListInfo">
-      <div>治疗费:{{ order.treatCostTotal ? order.treatCostTotal.toFixed(2)  : "" }}</div>
-      <div>护理费:</div>
-      <div>床位费:{{ order.bedCostTotal ? order.bedCostTotal.toFixed(2)  : "" }}</div>
-    </div>
-    <div class="allListInfo">
-      <div>麻醉费:</div>
-      <div>
-        材料费:{{ order.materialCostTotal ? order.materialCostTotal.toFixed(2)  : "" }}
-      </div>
-      <div>其他:{{ order.otherCostTotal ? order.otherCostTotal.toFixed(2)  : "" }}</div>
-    </div>
-    <!--    <div style="display:flex;justify-content: space-between;">-->
-    <!--          <div style="position: absolute;top:160px;left:40px">西药</div>-->
-    <!--          <div style="position: absolute;top:160px;left:110px">{{ list.westernMedicineCostTotal }}</div>-->
-    <!--          <div style="position: absolute;top:160px;left:180px">检查费</div>-->
-    <!--          <div style="position: absolute;top:160px;left:260px">{{ list.checkCostTotal }}</div>-->
-    <!--          <div style="position: absolute;top:160px;left:340px">化验费</div>-->
-    <!--          <div style="position: absolute;top:160px;left:420px">{{ list.treatCostTotal }}</div>-->
-    <!--          <div style="position: absolute;top:160px;left:500px">治疗费</div>-->
-    <!--          <div style="position: absolute;top:160px;left:580px">{{ list.bedCostTotal }}</div>-->
-    <!--          <div style="position: absolute;top:160px;left:500px">麻醉费</div>-->
-    <!--          <div style="position: absolute;top:160px;left:580px">{{ list.bedCostTotal }}</div>-->
-    <!--    </div>-->
-    <!--    <div style="display:flex;justify-content: space-between;">-->
-    <!--      <div style="position: absolute;top:190px;left:40px">中成药</div>-->
-    <!--      <div style="position: absolute;top:190px;left:110px">{{ list.chineseTraditionalMedicineCostTotal }}</div>-->
-    <!--      <div style="position: absolute;top:190px;left:180px">输氧费</div>-->
-    <!--      <div style="position: absolute;top:190px;left:260px">{{ list.laboratoryCostTotal }}</div>-->
-    <!--      <div style="position: absolute;top:190px;left:340px">输血费</div>-->
-    <!--      <div style="position: absolute;top:190px;left:420px">{{ list.operationCostTotal }}</div>-->
-    <!--      <div style="position: absolute;top:190px;left:500px">护理费</div>-->
-    <!--      <div style="position: absolute;top:190px;left:580px">{{ list.otherCostTotal }}</div>-->
-
-    <!--      <div style="position: absolute;top:160px;left:500px">材料费</div>-->
-    <!--      <div style="position: absolute;top:160px;left:580px">{{ list.bedCostTotal }}</div>-->
-    <!--    </div>-->
-    <!--    <div style="display:flex;justify-content: space-between;">-->
-    <!--      <div style="position: absolute;top:210px;left:40px">中草药</div>-->
-    <!--      <div style="position: absolute;top:210px;left:110px"></div>-->
-    <!--      <div style="position: absolute;top:210px;left:180px">手术费</div>-->
-    <!--      <div style="position: absolute;top:210px;left:260px"></div>-->
-    <!--      <div style="position: absolute;top:210px;left:340px">诊察费</div>-->
-    <!--      <div style="position: absolute;top:210px;left:420px">{{ list.materialCostTotal }}</div>-->
-    <!--      <div style="position: absolute;top:210px;left:500px">床位费</div>-->
-    <!--      <div style="position: absolute;top:210px;left:580px"></div>-->
-    <!--      <div style="position: absolute;top:160px;left:500px">其他</div>-->
-    <!--      <div style="position: absolute;top:160px;left:580px">{{ list.bedCostTotal }}</div>-->
-    <!--    </div>-->
-
-    <table class="allListTable" border="1">
-      <tr>
-        <td style="width: 10%">费用类别</td>
-        <td style="width: 35%">项目名称</td>
-        <td style="width: 5%">单位</td>
-        <td style="width: 10%">数量</td>
-        <td style="width: 10%">单价</td>
-        <td style="width: 10%">金额</td>
-        <td style="width: 10%">医保类型</td>
-      </tr>
-      <template v-for="(item, index) in list">
-        <tr v-if="item.is_total == 2">
-          <td style="width: 10%">{{ item.med_chrgitm_type }}</td>
-          <td
-            style="
-              width: 35%;
-              white-space: nowrap;
-              overflow: hidden;
-              text-overflow: ellipsis;
-            "
+    <table
+      class="allListTable"
+      border="0"
+      cellspacing="0"
+      style="font-size: 14px"
+      align="center"
+    >
+      <THEAD
+        style="
+          display: table-header-group;
+          font-weight: bold;
+        "
+      >
+        <TR style="border-bottom: 1px solid">
+          <TD colspan="4" align="center" style="font-size: 20px">
+            {{ $store.getters.xt_user.org.org_name }}汇总清单
+          </TD>
+        </TR>
+        <TR>
+          <TD colspan="1">科别：门诊</TD>
+          <TD width="130">床号：</TD>
+          <TD>门诊号：{{ order.mdtrt_id }}</TD>
+          <TD>姓名：{{ patient.name }}</TD>
+        </TR>
+        <TR style="border-bottom: 1px solid">
+          <TD colspan="2"> 预交款：</TD>
+          <TD>总费用：{{ order.medfee_sumamt }} </TD>
+          <TD
+            >门诊日期：{{
+              hospital.in_hosptial_time
+                ? hospital.in_hosptial_time.split(" ")[0]
+                : ""
+            }}</TD
+          >
+        </TR>
+        <TR>
+          <TD colspan="2">
+            西药:&nbsp;&nbsp;&nbsp;{{
+              order.westernMedicineCostTotal
+                ? order.westernMedicineCostTotal.toFixed(2)
+                : ""
+            }}</TD
+          >
+          <TD
+            >中成药:{{
+              order.chineseTraditionalMedicineCostTotal
+                ? order.chineseTraditionalMedicineCostTotal.toFixed(2)
+                : ""
+            }}</TD
+          >
+          <TD>中草药:</TD>
+        </TR>
+        <TR>
+          <TD colspan="2">
+            检查费:{{
+              order.checkCostTotal ? order.checkCostTotal.toFixed(2) : ""
+            }}</TD
+          >
+          <TD>输氧费:</TD>
+          <TD
+            >手术费:{{
+              order.operationCostTotal
+                ? order.operationCostTotal.toFixed(2)
+                : ""
+            }}</TD
+          >
+        </TR>
+        <TR>
+          <TD colspan="2"
+            >化验费:{{
+              order.laboratoryCostTotal
+                ? order.laboratoryCostTotal.toFixed(2)
+                : ""
+            }}</TD
+          >
+          <TD>输血费:</TD>
+          <TD
+            >诊察费:{{
+              order.zhenChaCostTotal ? order.zhenChaCostTotal.toFixed(2) : ""
+            }}</TD
+          >
+        </TR>
+        <TR>
+          <TD colspan="2"
+            >治疗费:{{
+              order.treatCostTotal ? order.treatCostTotal.toFixed(2) : ""
+            }}</TD
+          >
+          <TD>护理费:</TD>
+          <TD
+            >床位费:{{
+              order.bedCostTotal ? order.bedCostTotal.toFixed(2) : ""
+            }}</TD
           >
-            {{ item.name }}{{ item.spec }}
-          </td>
-          <td style="width: 5%">{{ item.unit }}</td>
-          <td style="width: 10%; text-align: right">{{ item.count }}</td>
-          <td style="width: 10%; text-align: right">
-            {{ item.price.toFixed(4) }}
-          </td>
-          <td style="width: 10%; text-align: right">
-            {{ (item.price * item.count).toFixed(2) }}
-          </td>
-          <td style="width: 10%">{{ item.medicine_insurance_kind }}</td>
-        </tr>
-        <tr v-if="item.is_total == 1">
-          <td style="width: 10%"></td>
-          <td
-            style="
-              width: 35%;
-              white-space: nowrap;
-              overflow: hidden;
-              text-overflow: ellipsis;
-            "
+        </TR>
+        <TR>
+          <TD colspan="2">麻醉费:</TD>
+          <TD
+            >材料费:{{
+              order.materialCostTotal ? order.materialCostTotal.toFixed(2) : ""
+            }}</TD
           >
-            合计
-          </td>
-          <td style="width: 5%"></td>
-          <td style="width: 10%; text-align: right"></td>
-          <td style="width: 10%; text-align: right"></td>
-          <td style="width: 10%; text-align: right">{{ item.total }}</td>
-          <td style="width: 10%"></td>
-        </tr>
-      </template>
+          <TD
+            >其他:{{
+              order.otherCostTotal ? order.otherCostTotal.toFixed(2) : ""
+            }}</TD
+          >
+        </TR>
+      </THEAD>
+
+      <TBODY style="text-align: center">
+        <TR>
+          <TD colspan="4">
+            <Table class="allListTable_1" border="1">
+              <TR>
+                <TH width="70"> 费用类别 </TH>
+                <TH width="70"> 项目名称 </TH>
+                <TH width="70">单位</TH>
+                <TH width="70">数量</TH>
+                <TH width="70">单价</TH>
+                <TH width="70">金额</TH>
+                <TH width="70">医保类型</TH>
+              </TR>
+              <template v-for="(item, index) in list">
+                <tr v-if="item.is_total == 2">
+                  <td style="width: 10%">{{ item.med_chrgitm_type }}</td>
+                  <td
+                    style="
+                      width: 35%;
+                      white-space: nowrap;
+                      overflow: hidden;
+                      text-overflow: ellipsis;
+                    "
+                  >
+                    {{ item.name }}{{ item.spec }}
+                  </td>
+                  <td style="width: 5%">{{ item.unit }}</td>
+                  <td style="width: 10%; text-align: right">
+                    {{ item.count }}
+                  </td>
+                  <td style="width: 10%; text-align: right">
+                    {{ item.price.toFixed(4) }}
+                  </td>
+                  <td style="width: 10%; text-align: right">
+                    {{ (item.price * item.count).toFixed(2) }}
+                  </td>
+                  <td style="width: 10%">{{ item.medicine_insurance_kind }}</td>
+                </tr>
+                <tr v-if="item.is_total == 1">
+                  <td style="width: 10%"></td>
+                  <td
+                    style="
+                      width: 35%;
+                      white-space: nowrap;
+                      overflow: hidden;
+                      text-overflow: ellipsis;
+                    "
+                  >
+                    合计
+                  </td>
+                  <td style="width: 5%"></td>
+                  <td style="width: 10%; text-align: right"></td>
+                  <td style="width: 10%; text-align: right"></td>
+                  <td style="width: 10%; text-align: right">
+                    {{ item.total }}
+                  </td>
+                  <td style="width: 10%"></td>
+                </tr>
+              </template>
+            </Table>
+          </TD>
+        </TR>
+      </TBODY>
     </table>
   </div>
 </template>
@@ -229,7 +250,6 @@ export default {
   },
   watch: {
     list: {
-     
       handler(newVal) {
         this.getPage();
       },
@@ -264,7 +284,7 @@ export default {
   margin: 10px 0;
 }
 
-.allListInfo div{
+.allListInfo div {
   min-width: 200px;
 }
 
@@ -282,6 +302,20 @@ export default {
   padding: 0 5px;
 }
 
+.allListTable_1 {
+  width: 100%;
+  text-align: center;
+  border-collapse: collapse;
+  line-height: 20px;
+  font-size: 14px;
+  border-color: #000;
+  text-align: left;
+}
+
+.allListTable_1 tr td {
+  padding: 0 5px;
+}
+
 .tableBottom {
   font-size: 16px;
   display: flex;
@@ -291,4 +325,5 @@ export default {
 .tableBottomOne {
   margin-right: 40px;
 }
+
 </style>

src/xt_pages/outpatientCharges/components/chargeDialog.vue

@@ -148,7 +148,7 @@
           // {value: 2, label: '银行卡'},
           // {value: 3, label: '微信'},
           // {value: 4, label: '支付宝'},
-          {value: 5, label: '医保卡'},
+          {value: 4, label: '医保卡'},
 
         ],
         total:"",

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -716,11 +716,9 @@
         this.form.diagnosis = this.diagnoses[0].id
         this.form.id_card_type = 2
         this.form.certificates = 1
-
-        if (this.$store.getters.xt_user.org_id == 10188  || this.$store.getters.xt_user.org_id == 10217){
+        if (this.$store.getters.xt_user.org_id == 10188  || this.$store.getters.xt_user.org_id == 10217 || this.$store.getters.xt_user.org_id == 10191){
           this.form.id_card_type = 1
         }
-
         if (departments.length > 0) {
           this.form.department = departments[0].id
         }

src/xt_pages/outpatientCharges/components/registerDialog9504.vue

@@ -241,7 +241,10 @@
         },{
           value: 2,
           label: '身份证'
-        }],
+        },{
+          value: 4,
+          label: '电子凭证'
+        },],
         settlement: [
           {value: 1, label: '医保'},
           {value: 2, label: '自费'},

src/xt_pages/outpatientCharges/costComparison.vue

@@ -476,7 +476,7 @@ c<template>
             insutype: this.insutype,
             clr_type: this.clr_type,
             clr_optins:this.query_clr_org,
-            admin_user_id:that.$store.getters.xt_user.user.id,
+            admin_user_id:this.$store.getters.xt_user.user.id,
           }
           var that = this
             axios.get('http://127.0.0.1:9532/api/checkaccount/get', {

src/xt_pages/outpatientCharges/listPrint.vue

@@ -14,11 +14,11 @@
     </template>
 
     <div class='dialysisPage' style="padding-top:40px;">
-      <printOne v-if="org_id != 10106&&org_id != 10215&&org_id != 10265 && org_id != 0" :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
+      <printOne v-if="org_id != 10106&&org_id != 10215&&org_id != 10265 && org_id != 0 && org_id!=9675" :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
       <printTwo v-if="org_id == 10106 && this.paramsObj.balance_accounts_type != 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></printTwo>
       <print-three v-if="org_id == 10106 && this.paramsObj.balance_accounts_type == 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></print-three>
-      <list-print-two v-if="org_id == 10215 " :list="list" :patient="patient" :order="order" :admin="admin"></list-print-two>
-      <print-two10265  v-if="org_id == 10265 || org_id == 0" :list="list" :patient="patient" :order="order" :admin="admin" :hospital_record="hospital_record"></print-two10265>
+      <list-print-two v-if="org_id == 10215 || org_id == 0 || org_id==9675" :list="list" :patient="patient" :order="order" :admin="admin"></list-print-two>
+      <print-two10265  v-if="org_id == 10265 " :list="list" :patient="patient" :order="order" :admin="admin" :hospital_record="hospital_record"></print-two10265>
     </div>
   </div>
 </template>
@@ -152,7 +152,7 @@
               }
 
               this.list.sort((a,b) => a.sort < b.sort ? 1 : a.sort > b.sort ? -1 : 0)
-              console.log(this.list)
+              console.log(this.list,'sssss')
 
             }else{
               this.order = response.data.data.order
@@ -567,9 +567,9 @@
 
       printThisPage() {
         if(this.org_id != 10106){
-          if(this.org_id == 10215){
+          if(this.org_id == 10215 || this.org_id == 0|| this.org_id == 9675){
             const style =
-                '@media print {.allListTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.allListInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .allListTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;}.allListTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 20px;}.tableBottomOne{margin-right: 40px;}}'
+                '@media print {.allListTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.allListInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .listTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;}  .listTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 10px;}.tableBottomOne{margin-right: 40px;} .allListTable{border: none;width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;} .allListTable tr{page-break-inside:avoid;} .allListTable tr td {padding: 0 5px;border: 1px solid #000;}.tableBottom{font-size: 16px;display: flex;margin-top: 20px;}.tableBottomOne{margin-right: 40px;}}'
             printJS({
               printable: 'allList-print',
               type: 'html',
@@ -583,7 +583,7 @@
                 '@media print {.listTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.listInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .listTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;}.listTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 10px;}.tableBottomOne{margin-right: 40px;}}'
             printJS({
               printable: 'list-print',
-              type: 'html',
+              type: 'html', 
               style: style,
               scanStyles: false
             })

src/xt_pages/outpatientCharges/listTemplate/listPrintTwo.vue

@@ -1,9 +1,106 @@
 <template>
   <div id="allList-print" class="allList-print">
-    <div class="allListTitle">
-      {{ $store.getters.xt_user.org.org_name }}费用清单
-    </div>
-    <div class="allListInfo">
+    <table
+      class="listTable"
+      border="0"
+      cellspacing="0"
+      style="font-size: 14px"
+      align="center"
+    >
+      <THEAD
+        style="
+          display: table-header-group;
+          font-weight: bold;
+        "
+      >
+        <TR>
+          <TD colspan="3" align="center" style="font-size: 20px">
+            {{ $store.getters.xt_user.org.org_name }}费用清单
+          </TD>
+        </TR>
+        <TR>
+          <TD colspan="1">患者姓名：{{ patient.name }}</TD>
+          <TD>性别：{{ patient.gender == 1 ? "男" : "女" }}</TD>
+          <TD
+            >结算类型：{{
+              order.is_medicine_insurance == 1 ? "医保" : "自费"
+            }}</TD
+          >
+        </TR>
+        <TR>
+          <TD> 住院/门诊号：{{ order.mdtrt_id }} </TD>
+          <TD>科室：血透 </TD>
+          <TD>就诊流水号：{{ order.mdtrt_id }}</TD>
+        </TR>
+        <TR>
+          <TD> 总费用：{{ order.medfee_sumamt }} </TD>
+          <TD>个人支付：{{ order.psn_part_amt }} </TD>
+          <TD>基金支付记账：{{ order.fund_pay_sumamt }}</TD>
+        </TR>
+        <TR>
+          <TD>补充医疗支付记账：0.00</TD>
+          <TD>救助支付金额：{{ order.maf_pay }}</TD>
+          <TD></TD>
+        </TR>
+      </THEAD>
+
+      <TBODY style="text-align: center">
+        <TR>
+          <TD colspan="3">
+            <Table class="allListTable" border="1">
+              <TR>
+                <TD style="width: 5%">序号</TD>
+                <TD style="width: 15%">处方日期</TD>
+                <TD style="width: 10%">费用编号</TD>
+                <TD style="width: 40%">费用名称</TD>
+                <TD style="width: 5%">单位</TD>
+                <TD style="width: 5%">数量</TD>
+                <TD style="width: 10%">单价</TD>
+                <TD style="width: 10%">金额</TD>
+              </TR>
+              <template v-for="(item, index) in list">
+                <tr v-if="item.is_total == 0">
+                  <td style="width: 5%">{{ index + 1 }}</td>
+                  <td style="width: 15%">{{ item.p_time }}</td>
+                  <td style="width: 10%">
+                    {{ item.feedetl_sn.split("-")[2] }}
+                  </td>
+                  <td style="width: 30%; white-space: nowrap; overflow: hidden">
+                    {{ item.name }}{{ item.spec }}
+                  </td>
+                  <td style="width: 5%">{{ item.unit }}</td>
+                  <td style="width: 5%; text-align: right">{{ item.count }}</td>
+                  <td style="width: 10%; text-align: right">
+                    {{ item.price }}
+                  </td>
+                  <td style="width: 10%; text-align: right">
+                    {{ (item.price * item.count).toFixed(2) }}
+                  </td>
+                </tr>
+                <tr v-if="item.is_total == 1">
+                  <td style="width: 5%"></td>
+                  <td style="width: 15%"></td>
+                  <td style="width: 10%"></td>
+                  <td style="width: 30%; white-space: nowrap; overflow: hidden">
+                    {{ item.name }}
+                  </td>
+                  <td style="width: 5%"></td>
+                  <td style="width: 5%"></td>
+                  <td style="width: 10%; text-align: right"></td>
+                  <td style="width: 10%; text-align: right">
+                    {{ item.price }}
+                  </td>
+                </tr>
+              </template>
+            </Table>
+          </TD>
+        </TR>
+      </TBODY>
+    </table>
+    <!-- <div class="allListTitle">
+      
+    </div> -->
+    <!-- <div class="allListInfo">
       <div style="text-align: left">患者姓名：{{ patient.name }}</div>
       <div style="text-align: left; padding-left: -20px">
         性别：{{ patient.gender == 1 ? "男" : "女" }}
@@ -11,10 +108,9 @@
       <div style="text-align: left">
         结算类型：{{ order.is_medicine_insurance == 1 ? "医保" : "自费" }}
       </div>
-      <!--        <div>发票号码：</div>-->
-    </div>
+    </div> 
 
-    <div class="allListInfo">
+     <div class="allListInfo">
       <div style="text-align: left">住院/门诊号：{{ order.mdtrt_id }}</div>
       <div style="text-align: left">科室：血透</div>
       <div style="text-align: left">就诊流水号：{{ order.mdtrt_id }}</div>
@@ -26,53 +122,13 @@
       <div style="text-align: left">
         基金支付记账：{{ order.fund_pay_sumamt }}
       </div>
-    </div>
+    </div> 
 
     <div class="allListInfo">
       <div style="text-align: left">补充医疗支付记账：0.00</div>
       <div style="text-align: left">救助支付金额：{{ order.maf_pay }}</div>
       <div></div>
-    </div>
-    <table class="allListTable" border="1">
-      <tr>
-        <td style="width: 5%">序号</td>
-        <td style="width: 15%">处方日期</td>
-        <td style="width: 10%">费用编号</td>
-        <td style="width: 40%">费用名称</td>
-        <td style="width: 5%">单位</td>
-        <td style="width: 5%">数量</td>
-        <td style="width: 10%">单价</td>
-        <td style="width: 10%">金额</td>
-      </tr>
-      <template v-for="(item, index) in list">
-        <tr v-if="item.is_total == 0">
-          <td style="width: 5%">{{ index + 1 }}</td>
-          <td style="width: 15%">{{ item.p_time }}</td>
-          <td style="width: 10%">{{ item.feedetl_sn.split("-")[2] }}</td>
-          <td style="width: 30%; white-space: nowrap; overflow: hidden">
-            {{ item.name }}{{ item.spec }}
-          </td>
-          <td style="width: 5%">{{ item.unit }}</td>
-          <td style="width: 5%; text-align: right">{{ item.count }}</td>
-          <td style="width: 10%; text-align: right">{{ item.price }}</td>
-          <td style="width: 10%; text-align: right">
-            {{ (item.price * item.count).toFixed(2) }}
-          </td>
-        </tr>
-        <tr v-if="item.is_total == 1">
-          <td style="width: 5%"></td>
-          <td style="width: 15%"></td>
-          <td style="width: 10%"></td>
-          <td style="width: 30%; white-space: nowrap; overflow: hidden">
-            {{ item.name }}
-          </td>
-          <td style="width: 5%"></td>
-          <td style="width: 5%"></td>
-          <td style="width: 10%; text-align: right"></td>
-          <td style="width: 10%; text-align: right">{{ item.price }}</td>
-        </tr>
-      </template>
-    </table>
+    </div>-->
   </div>
 </template>
 
@@ -207,6 +263,36 @@ export default {
   margin-top: 20px;
 }
 
+.tableBottomOne {
+  margin-right: 40px;
+}
+
+.listTable {
+  width: 100%;
+  text-align: center;
+  border-collapse: collapse;
+  line-height: 40px;
+  font-size: 14px;
+  border-color: #000;
+  text-align: left;
+}
+.listTable thead {
+  width: 100%;
+  text-align: center;
+  border-collapse: collapse;
+  line-height: 40px;
+  font-size: 14px;
+  border-color: #000;
+  text-align: left;
+}
+.listTable thead tr td {
+  padding: 0 5px;
+}
+.tableBottom {
+  font-size: 16px;
+  display: flex;
+  margin-top: 20px;
+}
 .tableBottomOne {
   margin-right: 40px;
 }

src/xt_pages/outpatientCharges/listTemplate/printTwo10265.vue

@@ -12,8 +12,8 @@
           <TR
             ><TD colspan="4" align="center" style="font-size: 20px"
               >{{ $store.getters.xt_user.org.org_name }}费用清单</TD
-            ></TR
-          >
+            ></TR>
+          
           <TR>
             <TD colspan="1">个人编码:{{ order.psn_no }}</TD>
             <TD>住院号：{{ order.mdtrt_id }}</TD>
@@ -119,9 +119,8 @@
                 <TR>
                   <TD>报销类别费用合计</TD>
                   <TD>甲类：{{ getJaiTotal() ? getJaiTotal() : "0.00" }}</TD>
-                  <TD>乙类药品：{{ getYiTotal() ? getYiTotal() : "0.00" }}</TD>
+                  <TD>乙类：{{ getYiTotal() ? getYiTotal() : "0.00" }}</TD>
                   <TD>丙类：{{ getBingTotal() ? getBingTotal() : "0.00" }}</TD>
-                  <TD>非药品：0.00</TD>
                   <TD></TD>
                   <TD>其他：0.00</TD>
                 </TR>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -118,6 +118,11 @@
 <!--                       type="primary">撤销记账-->
 <!--            </el-button>-->
 
+            <el-button v-loading="loadingone" size="small"
+                       @click="open(40)"
+                       v-if="org_id == 10191"
+                       type="primary">登陆
+            </el-button>
 
             <el-button v-loading="loadingone" size="small"
                        @click="open(6)"
@@ -2853,6 +2858,10 @@ export default {
       }
     },
     open(index, med_type, order, prescriptions) {
+
+
+
+
       this.other_prescriptions = prescriptions
 
       if (index == 1) {
@@ -2869,8 +2878,7 @@ export default {
         this.paramsObj = obj
         this.treatVisible = true
         // this.$router.push('/outpatientCharges/treatPrint?record_date=' + this.record_date + '&patient_id=' + this.patient_id + '&prescription_id=' + this.prescription_id)
-      }
-      else if (index == 4) {//收费
+      } else if (index == 4) {//收费
         var ids = []
         for (let i = 0; i < prescriptions.length; i++) {
           ids.push(prescriptions[i].id)
@@ -2890,7 +2898,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 && this.$store.getters.xt_user.org_id != 10217) {
+          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.$store.getters.xt_user.org_id != 10191) {
             this.pwdFormVisible = true
             this.pwd = ''
           } else {
@@ -3190,7 +3198,8 @@ export default {
           'patient_id': this.patientInfo.id,
           'record_time': this.record_date,
           'org_id': this.$store.getters.xt_user.org_id,
-          'his_patient_id': this.hisPatientInfo.id
+          'his_patient_id': this.hisPatientInfo.id,
+          'admin_user_id':this.$store.getters.xt_user.user.id,
         }
         axios.get('http://127.0.0.1:9532/api/refunddetail/post', {
           params: params
@@ -3225,7 +3234,6 @@ export default {
                   confirmButtonText: '确 定',
                   type: 'warning'
                 }).then(() => {
-
                 }).catch(() => {
                 })
               }
@@ -3248,6 +3256,25 @@ export default {
         this.invoiceParams = paramsObj
         this.invoiceVisible = true
 
+      } else if(index == 40){
+        var that = this
+        let params = {
+        }
+        axios.get('http://127.0.0.1:9532/9001', {
+          params: params
+        })
+            .then(function(response) {
+              if (response.data.state == 0) {
+                that.$message.error(response.data.msg)
+                return false
+              } else {
+                that.$message({ message: '登陆成功', type: 'success', duration: 5000 })
+              }
+            })
+            .catch(function(error) {
+            })
+
+
       }
     }, getName(admin_user_id) {
       for (let i = 0; i < this.adminUserOptions.length; i++) {
@@ -4359,13 +4386,14 @@ export default {
                 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]))
+                  if(parseInt(response.data.data.info.diagnosis.split(',')[i]) !== NaN){
+                    this.form.diagnosis.push(parseInt(response.data.data.info.diagnosis.split(',')[i]))
+                  }
                 }
               }
-              console.log("~~~~~~")
-              console.log(this.form.diagnosis)
-              console.log(this.diagnoses)
-              console.log("~~~~~~")
+
+
+
 
 
 

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -28,21 +28,24 @@
           :info="info"
           :paramsObj="paramsObj"
           :balanceAccounts="balanceAccounts"
-          v-if="
-            org_id == 10138 || org_id == 4 || org_id == 10278
-          "
+          v-if="org_id == 10138 || org_id == 4 || org_id == 10278"
         ></printThree>
         <printFour
-          v-if="org_id == 9504 || org_id == 10028  || org_id == 10088"
+          v-if="org_id == 9504 || org_id == 10028 || org_id == 10088"
           :info="info"
           :paramsObj="paramsObj"
           :balanceAccounts="balanceAccounts"
         ></printFour>
-<!--        <privateChargePrint  :info="info" v-if="org_id == 10215 && this.paramsObj.balance_accounts_type == 2"></privateChargePrint>-->
-
+        <!--        <privateChargePrint  :info="info" v-if="org_id == 10215 && this.paramsObj.balance_accounts_type == 2"></privateChargePrint>-->
       </div>
-<!--      <print-other :info="info" v-if="org_id == 9919"></print-other>-->
-<!--      <printOne :info=" info" v-if="org_id == 10215 && this.paramsObj.balance_accounts_type == 2"></printOne>-->
+      <!--      <print-other :info="info" v-if="org_id == 9919"></print-other>-->
+      <!--      <printOne :info=" info" v-if="org_id == 10215 && this.paramsObj.balance_accounts_type == 2"></printOne>-->
+      <printFive
+        v-if="org_id == 0"
+        :info="info"
+        :paramsObj="paramsObj"
+        :balanceAccounts="balanceAccounts"
+      ></printFive>
       <printOne :info="info" v-else></printOne>
       <!-- 测试医保环境下表格样式放开以下这条 -->
       <!-- <testVue :info="info" v-else></testVue> -->
@@ -65,13 +68,14 @@ import privateChargePrint from "./statementTemplate/privateChargePrint";
 import printTwo from "./statementTemplate/printTwo";
 import printThree from "./statementTemplate/printThree";
 import printFour from "./statementTemplate/printFour";
+import printFive from "./statementTemplate/printFive";
 import testVue from "./statementTemplate/test";
 import {
   getAllDoctorList,
   getAllHisPatientList,
   getPrescriptionPrint,
 } from "@/api/project/project";
-import { getPrivateExpenses,getPrivateExpensesOrder } from "@/api/his/his";
+import { getPrivateExpenses, getPrivateExpensesOrder } from "@/api/his/his";
 // import PrintOther from '../hospitalStation/statementTemplate/printOther'
 export default {
   name: "dialysisPrintOrder",
@@ -83,6 +87,7 @@ export default {
     printThree,
     printFour,
     testVue,
+    printFive,
   },
   props: {
     paramsObj: Object,
@@ -115,7 +120,6 @@ export default {
 
       if (
         this.$store.getters.xt_user.org_id == 10138 ||
-        // this.$store.getters.xt_user.org_id == 0 ||
         this.$store.getters.xt_user.org_id == 4 ||
         this.$store.getters.xt_user.org_id == 10278
       ) {
@@ -256,6 +260,18 @@ export default {
             style: style,
             scanStyles: false,
           });
+        } else if (
+          this.$store.getters.xt_user.org_id == 0 ||
+          this.$store.getters.xt_user.org_id == 10191
+        ) {
+          const style =
+            "@media print {.statementTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 14px;border-color: #000;} .statementTable thead{font-size: 28px;text-align: center;font-weight: bold;margin-bottom: 10px;} .statementTable tbody{text-align:left;} .statementTable tbody .view_tr{text-align:center;border: 1px solid;} tbody .dashed_tr{border: 1px dashed;text-align:center} .list_table{width: 100%;margin-bottom: 100px;} tbody tr td div{height:25px;}}";
+          printJS({
+            printable: "statement-print",
+            type: "html",
+            style: style,
+            scanStyles: false,
+          });
         } else {
           const style =
             "@media print {#statement-print{font-size:14px;border:1px solid white}.statementTitle{font-size: 22px;text-align: center;font-weight: bold;}table{border-collapse: collapse;text-align: center;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 57%;}}}";
@@ -363,8 +379,8 @@ export default {
         let params = {
           his_patient_id: obj.his_patient_id,
           id: obj.order_id,
-          order_id:obj.order_id,
-          admin_user_id:this.$store.getters.xt_user.user.id,
+          order_id: obj.order_id,
+          admin_user_id: this.$store.getters.xt_user.user.id,
         };
         if (
           this.org_id == 10138 ||
@@ -491,16 +507,14 @@ export default {
               console.log(111, this.balanceAccounts);
             }
           });
-        }else
-          if (this.org_id == 10215 || this.org_id == 0) {
-
+        } else if (this.org_id == 10215 || this.org_id == 0) {
           getPrivateExpensesOrder(params).then((response) => {
             if (response.data.state == 0) {
               // this.$message.error(response.data.msg)
 
               return false;
             } else {
-              var that = this
+              var that = this;
               that.info = response.data.data.info;
               that.p_admin = response.data.data.printor_admin;
               that.charge_admin = response.data.data.charge_admin;
@@ -521,62 +535,62 @@ export default {
 
               that.info["bed_cost_total"] = response.data.data.bedCostTotal;
               that.info["bed_cost_self_total"] =
-                  response.data.data.bedCostSelfTotal;
+                response.data.data.bedCostSelfTotal;
               that.info["bed_cost_part_self_total"] =
-                  response.data.data.bedCostPartSelfTotal;
+                response.data.data.bedCostPartSelfTotal;
 
               that.info["operation_cost_total"] =
-                  response.data.data.operationCostTotal;
+                response.data.data.operationCostTotal;
               that.info["operation_cost_self_total"] =
-                  response.data.data.operationCostSelfTotal;
+                response.data.data.operationCostSelfTotal;
               that.info["operation_cost_part_self_total"] =
-                  response.data.data.operationCostPartSelfTotal;
+                response.data.data.operationCostPartSelfTotal;
 
               that.info["other_cost_total"] = response.data.data.otherCostTotal;
               that.info["other_cost_self_total"] =
-                  response.data.data.otherCostSelfTotal;
+                response.data.data.otherCostSelfTotal;
               that.info["other_cost_part_self_total"] =
-                  response.data.data.otherCostPartSelfTotal;
+                response.data.data.otherCostPartSelfTotal;
 
               that.info["material_cost_total"] =
-                  response.data.data.materialCostTotal;
+                response.data.data.materialCostTotal;
               that.info["material_cost_self_total"] =
-                  response.data.data.materialCostSelfTotal;
+                response.data.data.materialCostSelfTotal;
               that.info["material_cost_part_self_total"] =
-                  response.data.data.materialCostPartSelfTotal;
+                response.data.data.materialCostPartSelfTotal;
 
               that.info["western_medicine_cost_total"] =
-                  response.data.data.westernMedicineCostTotal;
+                response.data.data.westernMedicineCostTotal;
               that.info["western_medicine_cost_self_total"] =
-                  response.data.data.westernMedicineCostSelfTotal;
+                response.data.data.westernMedicineCostSelfTotal;
               that.info["western_medicine_cost_part_self_total"] =
-                  response.data.data.westernMedicineCostPartSelfTotal;
+                response.data.data.westernMedicineCostPartSelfTotal;
 
               that.info["chinese_traditional_medicine_cost_total"] =
-                  response.data.data.chineseTraditionalMedicineCostTotal;
+                response.data.data.chineseTraditionalMedicineCostTotal;
               that.info["chinese_traditional_medicine_cost_self_total"] =
-                  response.data.data.chineseTraditionalMedicineCostSelfTotal;
+                response.data.data.chineseTraditionalMedicineCostSelfTotal;
               that.info["chinese_traditional_medicine_cost_part_self_total"] =
-                  response.data.data.chineseTraditionalMedicineCostPartSelfTotal;
+                response.data.data.chineseTraditionalMedicineCostPartSelfTotal;
 
               that.info["check_cost_total"] = response.data.data.checkCostTotal;
               that.info["check_cost_self_total"] =
-                  response.data.data.checkCostSelfTotal;
+                response.data.data.checkCostSelfTotal;
               that.info["check_cost_part_self_total"] =
-                  response.data.data.checkCostPartSelfTotal;
+                response.data.data.checkCostPartSelfTotal;
 
               that.info["laboratory_cost_total"] =
-                  response.data.data.laboratoryCostTotal;
+                response.data.data.laboratoryCostTotal;
               that.info["laboratory_cost_self_total"] =
-                  response.data.data.laboratoryCostSelfTotal;
+                response.data.data.laboratoryCostSelfTotal;
               that.info["laboratory_cost_part_self_total"] =
-                  response.data.data.laboratoryCostPartSelfTotal;
+                response.data.data.laboratoryCostPartSelfTotal;
 
               that.info["treat_cost_total"] = response.data.data.treatCostTotal;
               that.info["treat_cost_self_total"] =
-                  response.data.data.treatCostSelfTotal;
+                response.data.data.treatCostSelfTotal;
               that.info["treat_cost_part_self_total"] =
-                  response.data.data.treatCostPartSelfTotal;
+                response.data.data.treatCostPartSelfTotal;
               that.info["date"] = response.data.data.date;
               // that.info["number"] = response.data.data.number;
               that.info["order_infos"] = response.data.data.order_infos;
@@ -643,7 +657,6 @@ export default {
               }
             }
           });
-
         }
       } else {
         var that = this;

src/xt_pages/outpatientCharges/statementTemplate/printFive.vue

@@ -0,0 +1,182 @@
+<template>
+  <div id="statement-print" class="statement-print">
+    <table class="statementTable" border="0">
+      <thead>
+        <tr>
+          <td colspan="10">石狮圣誉血液透析中心结算单</td>
+        </tr>
+      </thead>
+
+      <tbody>
+        <tr>
+          <td colspan="10">日期区间：</td>
+        </tr>
+        <tr class="view_tr">
+          <td colspan="2">姓名：</td>
+          <td colspan="2">性别：</td>
+          <td colspan="2">医保类型：</td>
+          <td colspan="2">社会保障号码：</td>
+          <td colspan="2">账号余额：</td>
+        </tr>
+        <tr class="view_tr">
+          <td colspan="10">明细信息</td>
+        </tr>
+
+        <!-- 帐单列表分为左右两列，需要对数据进行x/2分别放进list_L，list_R两个数组进行循环 -->
+        <tr>
+          <td colspan="6">
+            <table class="list_table">
+              <tr colspan="6" v-for="(item, index) in list_L" :key="index">
+                <td colspan="2">药名</td>
+                <td>规格</td>
+                <td>数量</td>
+                <td>价格</td>
+              </tr>
+            </table>
+          </td>
+
+          <td colspan="4">
+            <table class="list_table">
+              <tr colspan="4" v-for="(item, index) in list_R" :key="index">
+                <td colspan="2">药名</td>
+                <td>规格</td>
+                <td>数量</td>
+                <td>价格</td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+        <tr>
+          <td colspan="10">共一页，第一页419.32</td>
+        </tr>
+        <tr class="dashed_tr">
+          <td colspan="10">结付分类</td>
+        </tr>
+        <tr>
+          <td colspan="10">
+            <div>费用总计：</div>
+            <div>统筹支付：</div>
+            <div>账户支付：</div>
+            <div>个人现金支付：</div>
+            <div>其他支付：</div>
+            <div>减免金额：</div>
+          </td>
+        </tr>
+      </tbody>
+    </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 {};
+      },
+    },
+  },
+  data() {
+    return {
+      list_L: [1,2],
+      list_R: [1,2],
+    };
+  },
+  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;
+}
+.statementTable thead{
+  font-size: 28px;
+  text-align: center;
+  font-weight: bold;
+  margin-bottom: 10px;
+}
+
+.statementTable tbody{
+    text-align: left;
+}
+tbody .view_tr{
+    border: 1px solid;
+    text-align: center;
+}
+.list_table{
+    width: 100%;
+    margin-bottom: 100px;
+}
+tbody .dashed_tr{
+    border: 1px dashed;
+    text-align: center;
+}
+tbody tr td div{
+    height: 25px;
+}
+</style>

src/xt_pages/outpatientCharges/summary.vue

@@ -5,7 +5,7 @@
     </div>
     <div class="app-container">
       <div
-        style="
+          style="
           display: flex;
           justify-content: space-between;
           margin-bottom: 10px;
@@ -17,19 +17,19 @@
           <!--导出-->
           <!--</el-button>-->
           <el-input
-            size="small"
-            style="width: 150px"
-            v-model="keywords"
-            @input="searchAction"
-            @keyup.enter.native="searchAction"
-            class="filter-item"
+              size="small"
+              style="width: 150px"
+              v-model="keywords"
+              @input="searchAction"
+              @keyup.enter.native="searchAction"
+              class="filter-item"
           />
           <el-button
-            size="small"
-            style="margin-left: 10px"
-            class="filter-item"
-            type="primary"
-            @click="searchAction"
+              size="small"
+              style="margin-left: 10px"
+              class="filter-item"
+              type="primary"
+              @click="searchAction"
           >
             搜索
           </el-button>
@@ -48,48 +48,48 @@
           <!--                    </el-select>-->
 
           <el-select
-            size="small"
-            v-model="sort_type"
-            placeholder="请选择"
-            style="width: 150px; margin-left: 10px"
-            @change="changeSortType"
+              size="small"
+              v-model="sort_type"
+              placeholder="请选择"
+              style="width: 150px; margin-left: 10px"
+              @change="changeSortType"
           >
             <el-option
-              v-for="(item, index) in sort_types"
-              :key="index"
-              :label="item.label"
-              :value="item.value"
+                v-for="(item, index) in sort_types"
+                :key="index"
+                :label="item.label"
+                :value="item.value"
             >
             </el-option>
           </el-select>
           <el-date-picker
-            size="small"
-            v-model="start_time"
-            prefix-icon="el-icon-date"
-            @change="handleStartTimeChange"
-            :editable="false"
-            :clearable="false"
-            style="width: 196px; margin-right: 10px"
-            type="date"
-            placeholder="选择开始日期"
-            format="yyyy-MM-dd"
-            value-format="yyyy-MM-dd"
-            align="right"
+              size="small"
+              v-model="start_time"
+              prefix-icon="el-icon-date"
+              @change="handleStartTimeChange"
+              :editable="false"
+              :clearable="false"
+              style="width: 196px; margin-right: 10px"
+              type="date"
+              placeholder="选择开始日期"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+              align="right"
           ></el-date-picker>
 
           <el-date-picker
-            size="small"
-            v-model="end_time"
-            prefix-icon="el-icon-date"
-            @change="handleEndTimeChange"
-            :editable="false"
-            :clearable="false"
-            style="width: 196px; margin-right: 10px"
-            type="date"
-            placeholder="选择结束日期"
-            format="yyyy-MM-dd"
-            value-format="yyyy-MM-dd"
-            align="right"
+              size="small"
+              v-model="end_time"
+              prefix-icon="el-icon-date"
+              @change="handleEndTimeChange"
+              :editable="false"
+              :clearable="false"
+              style="width: 196px; margin-right: 10px"
+              type="date"
+              placeholder="选择结束日期"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+              align="right"
           ></el-date-picker>
           <!--<el-radio v-model="radio" label="1">明细</el-radio>-->
           <!--<el-radio v-model="radio" label="2">汇总</el-radio>-->
@@ -105,27 +105,32 @@
 
                     </el-popover> -->
           <el-button size="small" type="primary" @click="export_detail"
-            >报表下载</el-button
+          >报表下载
+          </el-button
           >
+<!--          <el-button size="small" type="primary" @click="export_detail_two"-->
+<!--          >报表下载2-->
+<!--          </el-button-->
+<!--          >-->
         </div>
       </div>
       <el-table
-        :data="tableData"
-        border
-        style="width: 100%"
-        :row-style="{ color: '#303133' }"
-        :header-cell-style="{
+          :data="tableData"
+          border
+          style="width: 100%"
+          :row-style="{ color: '#303133' }"
+          :header-cell-style="{
           backgroundColor: 'rgb(245, 247, 250)',
           color: '#606266',
         }"
-        highlight-current-row
+          highlight-current-row
       >
         <el-table-column
-          prop="date"
-          label="序号"
-          width="60"
-          align="center"
-          type="index"
+            prop="date"
+            label="序号"
+            width="60"
+            align="center"
+            type="index"
         >
         </el-table-column>
         <el-table-column align="center" width="100" prop="name" label="就诊号">
@@ -140,18 +145,21 @@
 
         <el-table-column align="center" width="90" prop="name" label="应收金额">
           <template slot-scope="scope">{{
-            scope.row.medfee_sumamt.toFixed(2)
-          }}</template>
+              scope.row.medfee_sumamt.toFixed(2)
+            }}
+          </template>
         </el-table-column>
         <el-table-column align="center" width="90" prop="name" label="实收金额">
           <template slot-scope="scope">{{
-            scope.row.reality_price.toFixed(2)
-          }}</template>
+              scope.row.reality_price.toFixed(2)
+            }}
+          </template>
         </el-table-column>
         <el-table-column align="center" width="90" prop="name" label="科室">
           <template slot-scope="scope">{{
-            scope.row.department_name
-          }}</template>
+              scope.row.department_name
+            }}
+          </template>
         </el-table-column>
         <el-table-column align="center" width="90" prop="name" label="医疗类型">
           <template slot-scope="scope">
@@ -171,23 +179,24 @@
         </el-table-column>
 
         <el-table-column
-          align="center"
-          width="100"
-          prop="name"
-          label="收费日期"
+            align="center"
+            width="100"
+            prop="name"
+            label="收费日期"
         >
           <template slot-scope="scope">
             {{
               scope.row.setl_time
-                ? scope.row.setl_time
-                : getTimes(scope.row.settle_accounts_date)
+                  ? scope.row.setl_time
+                  : getTimes(scope.row.settle_accounts_date)
             }}
           </template>
         </el-table-column>
         <el-table-column align="center" width="90" prop="name" label="收费员">
           <template slot-scope="scope">{{
-            getName(scope.row.creator)
-          }}</template>
+              getName(scope.row.creator)
+            }}
+          </template>
         </el-table-column>
         <el-table-column align="center" width="80" prop="name" label="状态">
           <template slot-scope="scope">
@@ -199,88 +208,90 @@
         <el-table-column align="center" prop="name" label="操作">
           <template slot-scope="scope">
             <el-button size="mini" type="primary" @click="toDetail(scope.row)"
-              >详情</el-button
+            >详情
+            </el-button
             >
             <el-button size="mini" type="primary" @click="toPrint(scope.row)">
               结算单
             </el-button>
             <el-button
-              size="mini"
-              type="primary"
-              @click="uploadInfo(scope.row)"
-              v-if="scope.row.order_status == 2 && scope.row.result.id == 0"
+                size="mini"
+                type="primary"
+                @click="uploadInfo(scope.row)"
+                v-if="scope.row.order_status == 2 && scope.row.result.id == 0"
             >
               上传结算清单
             </el-button>
             <el-button
-              size="mini"
-              type="primary"
-              @click="cancelUpload(scope.row)"
-              v-if="scope.row.order_status == 2 && scope.row.result.id > 0"
+                size="mini"
+                type="primary"
+                @click="cancelUpload(scope.row)"
+                v-if="scope.row.order_status == 2 && scope.row.result.id > 0"
             >
               撤销结算清单
             </el-button>
             <el-button
-              size="mini"
-              type="primary"
-              v-if="
+                size="mini"
+                type="primary"
+                v-if="
                 scope.row.order_status == 2 &&
                 $store.getters.xt_user.org_id == 10106
               "
-              @click="settlementPrint(scope.row)"
-              >结算单
+                @click="settlementPrint(scope.row)"
+            >结算单
             </el-button>
             <el-button size="mini" type="primary" @click="toRefund(scope.row)">
               退费
             </el-button>
             <el-button
-              size="mini"
-              type="primary"
-              @click="invoicePrint(scope.row)"
-              >打印发票</el-button
+                size="mini"
+                type="primary"
+                @click="invoicePrint(scope.row)"
+            >打印发票
+            </el-button
             >
           </template>
         </el-table-column>
       </el-table>
       <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :page-sizes="[10, 50, 100]"
-        :page-size="10"
-        :current-page.sync="page"
-        background
-        style="margin-top: 20px; float: right"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :page-sizes="[10, 50, 100]"
+          :page-size="10"
+          :current-page.sync="page"
+          background
+          style="margin-top: 20px; float: right"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total"
       >
       </el-pagination>
     </div>
 
     <el-dialog
-      class="centerDialog"
-      width="1200px"
-      title="打印"
-      :visible.sync="statementVisible"
+        class="centerDialog"
+        width="1200px"
+        title="打印"
+        :visible.sync="statementVisible"
     >
       <!--<statementPrint ref="print" :paramsObj='orderObj'></statementPrint>-->
       <new-statement-print
-        ref="print"
-        :paramsObj="orderObj"
+          ref="print"
+          :paramsObj="orderObj"
       ></new-statement-print>
     </el-dialog>
     <el-dialog
-      class="centerDialog"
-      width="900px"
-      title="打印"
-      :visible.sync="listVisible"
+        class="centerDialog"
+        width="900px"
+        title="打印"
+        :visible.sync="listVisible"
     >
       <listPrint></listPrint>
     </el-dialog>
     <el-dialog
-      class="centerDialog"
-      width="900px"
-      title="打印"
-      :visible.sync="allListVisible"
+        class="centerDialog"
+        width="900px"
+        title="打印"
+        :visible.sync="allListVisible"
     >
       <allListPrint :paramsObj="paramsObj"></allListPrint>
     </el-dialog>
@@ -296,22 +307,22 @@
     <!--</el-dialog>-->
 
     <el-dialog
-      class="centerDialog"
-      width="1200px"
-      title="打印"
-      :visible.sync="invoiceVisible"
+        class="centerDialog"
+        width="1200px"
+        title="打印"
+        :visible.sync="invoiceVisible"
     >
       <invoice-print ref="print" :invoiceParams="invoiceParams"></invoice-print>
     </el-dialog>
     <el-dialog
-      class="centerDialog"
-      width="1200px"
-      title="打印"
-      :visible.sync="settlementVisible"
+        class="centerDialog"
+        width="1200px"
+        title="打印"
+        :visible.sync="settlementVisible"
     >
       <settlement-print
-        ref="print"
-        :paramsObj="settlementObj"
+          ref="print"
+          :paramsObj="settlementObj"
       ></settlement-print>
     </el-dialog>
   </div>
@@ -320,22 +331,18 @@
 
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
-import {
-  getDoctorList,
-  getExportConsumeDetailList,
-  getHisOrderList,
-  Refund,
-} from "@/api/his/his";
-import { uParseTime } from "@/utils/tools";
+import {getDoctorList, getExportConsumeDetailList, getHisOrderList, Refund,} from "@/api/his/his";
+import {uParseTime} from "@/utils/tools";
 // import NewStatementPrint from './newStatementPrint'
 import NewStatementPrint from "./statementPrint.vue";
 import listPrint from "./listPrint";
 import allListPrint from "./allListPrint";
 import NewStatementPrintTwo from "./newStatementPrintTwo";
-import { fetchAllAdminUsers } from "@/api/doctor";
+import {fetchAllAdminUsers} from "@/api/doctor";
 import axios from "axios";
 import invoicePrint from "./invoicePrint";
 import settlementPrint from "./settlementPrint";
+import {getHisDataTwo} from "../../api/his/his";
 
 export default {
   name: "OutpatientChargesSummary",
@@ -355,8 +362,8 @@ export default {
       statementVisible9504: false,
       orderObj9504: {},
       crumbs: [
-        { path: false, name: "门诊收费" },
-        { path: false, name: "项目消费明细汇总" },
+        {path: false, name: "门诊收费"},
+        {path: false, name: "项目消费明细汇总"},
       ],
       tableData: [],
       limit: 10,
@@ -368,8 +375,8 @@ export default {
       doctors: [],
       sort_type: 1,
       sort_types: [
-        { value: 1, label: "处方时间" },
-        { value: 2, label: "结算时间" },
+        {value: 1, label: "处方时间"},
+        {value: 2, label: "结算时间"},
       ],
       admin_user_id: "",
       listVisible: false,
@@ -398,8 +405,8 @@ export default {
         vm.sort_type = vm.$store.getters.pagedata.list.sort_type;
         setTimeout(() => {
           vm.getHisOrderList();
-        },300)
-        
+        }, 300)
+
       });
     } else {
       next();
@@ -422,13 +429,7 @@ export default {
     this.getHisOrderList();
   },
 
- 
   methods: {
-    // watchtoute() {
-    //   console.log(this.$router, "iiii");
-    //   console.log(this.$route, "iiii");
-    // },
-
     setStorage() {
       this.$store.commit("SET_PAGEDATA", {
         page: this.page,
@@ -471,64 +472,70 @@ export default {
     cancelUpload(row) {
       var that = this;
       axios
-        .get("http://127.0.0.1:9532/zh/api/clearsettle", {
-          params: {
-            order_id: row.id,
-            admin_user_id: this.$store.getters.xt_user.user.id,
-          },
-        })
-        .then(function (response) {
-          if (response.data.state == 0) {
-            that.$message.error(response.data.msg);
-            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(() => {});
+          .get("http://127.0.0.1:9532/zh/api/clearsettle", {
+            params: {
+              order_id: row.id,
+              admin_user_id: this.$store.getters.xt_user.user.id,
+            },
+          })
+          .then(function (response) {
+            if (response.data.state == 0) {
+              that.$message.error(response.data.msg);
+              return false;
             } else {
-              that.$message.success("撤销成功");
-              row.result.id = 0;
+              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("撤销成功");
+                row.result.id = 0;
+              }
             }
-          }
-        })
-        .catch(function (error) {});
+          })
+          .catch(function (error) {
+          });
     },
     uploadInfo(row) {
       var that = this;
       axios
-        .get("http://127.0.0.1:9532/api/settlelist/get", {
-          params: {
-            order_id: row.id,
-            admin_user_id: this.$store.getters.xt_user.user.id,
-          },
-        })
-        .then(function (response) {
-          if (response.data.state == 0) {
-            that.$message.error(response.data.msg);
-            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(() => {});
+          .get("http://127.0.0.1:9532/api/settlelist/get", {
+            params: {
+              order_id: row.id,
+              admin_user_id: this.$store.getters.xt_user.user.id,
+            },
+          })
+          .then(function (response) {
+            if (response.data.state == 0) {
+              that.$message.error(response.data.msg);
+              return false;
             } else {
-              that.$message.success("上传成功");
-              row.result.id = response.data.data.result.id;
+              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("上传成功");
+                row.result.id = response.data.data.result.id;
+              }
             }
-          }
-        })
-        .catch(function (error) {});
+          })
+          .catch(function (error) {
+          });
     },
 
     fetchAllAdminUsers() {
@@ -552,23 +559,24 @@ export default {
           cancelButtonText: "取 消",
           type: "warning",
         })
-          .then(() => {
-            let params = {
-              order_id: row.id,
-              patient_id: row.patient_id,
-              record_time: this.getTimes(row.settle_accounts_date),
-            };
-            Refund(params).then((response) => {
-              if (response.data.state == 0) {
-                this.$message.error(response.data.msg);
-                return false;
-              } else {
-                this.$message({ message: "退费成功", type: "success" });
-                this.getHisOrderList();
-              }
+            .then(() => {
+              let params = {
+                order_id: row.id,
+                patient_id: row.patient_id,
+                record_time: this.getTimes(row.settle_accounts_date),
+              };
+              Refund(params).then((response) => {
+                if (response.data.state == 0) {
+                  this.$message.error(response.data.msg);
+                  return false;
+                } else {
+                  this.$message({message: "退费成功", type: "success"});
+                  this.getHisOrderList();
+                }
+              });
+            })
+            .catch(() => {
             });
-          })
-          .catch(() => {});
       } else {
         var that = this;
         this.$confirm("是否退费", "退费", {
@@ -576,44 +584,48 @@ export default {
           cancelButtonText: "取 消",
           type: "warning",
         })
-          .then(() => {
-            let params = {
-              order_id: row.id,
-              patient_id: row.patient_id,
-              record_time: that.getTimes(row.settle_accounts_date),
-              admin_user_id: that.$store.getters.xt_user.user.id,
-            };
-            axios
-              .get("http://127.0.0.1:9532/api/refund/post", {
-                params: params,
-              })
-              .then(function (response) {
-                if (response.data.state == 0) {
-                  that.$message.error(response.data.msg);
-                  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(() => {});
-                  } else {
-                    that.$message({
-                      message: "退费成功",
-                      type: "success",
-                      duration: 5000,
-                    });
-                    that.getHisOrderList();
-                  }
-                }
-              })
-              .catch(function (error) {});
-          })
-          .catch(() => {});
+            .then(() => {
+              let params = {
+                order_id: row.id,
+                patient_id: row.patient_id,
+                record_time: that.getTimes(row.settle_accounts_date),
+                admin_user_id: that.$store.getters.xt_user.user.id,
+              };
+              axios
+                  .get("http://127.0.0.1:9532/api/refund/post", {
+                    params: params,
+                  })
+                  .then(function (response) {
+                    if (response.data.state == 0) {
+                      that.$message.error(response.data.msg);
+                      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(() => {
+                            });
+                      } else {
+                        that.$message({
+                          message: "退费成功",
+                          type: "success",
+                          duration: 5000,
+                        });
+                        that.getHisOrderList();
+                      }
+                    }
+                  })
+                  .catch(function (error) {
+                  });
+            })
+            .catch(() => {
+            });
       }
     },
     toPrint(row) {
@@ -657,7 +669,161 @@ export default {
         order_id: row.id,
       };
       this.settlementObj = obj;
+    }, export_detail_two() {
+      let params = {};
+      getHisDataTwo(params).then((response) => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          let list = [];
+          console.log(response.data.data.order)
+          for (let i = 0; i < response.data.data.order.length; i++) {
+            let order = response.data.data.order[i];
+            for (let b = 0; b < order.info.length; b++) {
+              let obj = {
+                index: b + 1,
+                org_name: "肇庆三鹤血液透析中心",
+                name: order.psn_name,
+                id_card_no: order.certno,
+                level: "未定级",
+                psn_type: order.psn_type,
+                date: "2022年3月",
+                start_time: order.his.in_hosptial_time,
+                end_time: order.his.out_hosptial_time,
+                total: order.info[b].det_item_fee_sumamt,
+                fund_total: order.info[b].inscp_scp_amt,
+                patient_id: order.info[b].patient_id,
+                dialysis_time:this.getTimes(order.info[b].upload_date)
+
+              }
+              // if (order.info[b].advice_id > 0 && order.info[b].project_id == 0) {
+              //   obj["dialysis_time"] = this.getTimes(order.info[b].advice_date)
+              // } else if (order.info[b].advice_id == 0 && order.info[b].project_id > 0) {
+              //   obj["dialysis_time"] = this.getTimes(order.info[b].record_date)
+              // }
+              if (order.psn_type == "11") {
+
+                obj["psn_type"] = "职工在职"
+              } else if (order.psn_type == "12") {
+                obj["psn_type"] = "职工退休"
+
+              } else if (order.psn_type == "13") {
+                obj["psn_type"] = "离休"
+
+              } else if (order.psn_type == "14") {
+                obj["psn_type"] = "居民医保"
+
+              } else if (order.psn_type == "15") {
+
+                obj["psn_type"] = "居民医保"
+
+              } else if (order.psn_type == "16") {
+                obj["psn_type"] = "居民医保"
+
+              }
+
+              list.push(obj)
+            }
+          }
+          console.log(list)
+
+          var new_list = this.unique_two(list)
+
+          for (let i = 0; i < new_list.length; i++) {
+            let total = 0
+            let fund_total = 0
+            for (let b = 0; b < list.length; b++) {
+              if (new_list[i].patient_id == list[b].patient_id && new_list[i].dialysis_time == list[b].dialysis_time) {
+                total = total + list[b].total
+                fund_total = fund_total + list[b].fund_total
+              }
+            }
+            new_list[i].total = total.toFixed(2)
+            new_list[i].fund_total = fund_total.toFixed(2)
+
+          }
+
+          console.log(new_list)
+
+          var tarList = [];
+          for (let i = 0; i < new_list.length; i++) {
+            let obj = {
+              "序号": i + 1,
+              "医疗机构名称": new_list[i].org_name,
+              "姓名": new_list[i].name,
+              "身份证号": new_list[i].id_card_no,
+              "医院等级": new_list[i].level,
+              "参保类型": new_list[i].psn_type,
+              "费用所属期": new_list[i].date,
+              "开始就医时间": new_list[i].start_time,
+              "结束就医时间": new_list[i].end_time,
+              "透析日期": new_list[i].dialysis_time,
+              "本次透析医疗总金额": new_list[i].total,
+              "本次透析医保结算费用金额": new_list[i].fund_total,
+
+            }
+            tarList.push(obj)
+
+          }
+
+          import("@/vendor/Export2Excel").then((excel) => {
+            const tHeader = [
+              "序号",
+              "医疗机构名称",
+              "姓名",
+              "身份证号",
+              "医院等级",
+              "参保类型",
+              "费用所属期",
+              "开始就医时间",
+              "结束就医时间",
+              "透析日期",
+              "本次透析医疗总金额",
+              "本次透析医保结算费用金额",
+
+            ];
+            const filterVal = [
+              "序号",
+              "医疗机构名称",
+              "姓名",
+              "身份证号",
+              "医院等级",
+              "参保类型",
+              "费用所属期",
+              "开始就医时间",
+              "结束就医时间",
+              "透析日期",
+              "本次透析医疗总金额",
+              "本次透析医保结算费用金额",
+
+            ];
+            const data = this.formatJson(filterVal, tarList);
+            excel.export_json_to_excel({
+              header: tHeader,
+              data,
+              filename: "消费明细",
+            });
+          });
+        }
+      });
+    }, unique_two(array) {
+      // res用来存储结果
+      var res = []
+      for (var i = 0, arrayLen = array.length; i < arrayLen; i++) {
+        for (var j = 0, resLen = res.length; j < resLen; j++) {
+          if (array[i].patient_id === res[j].patient_id && array[i].dialysis_time === res[j].dialysis_time) {
+            break
+          }
+        }
+        // 如果array[i]是唯一的，那么执行完循环，j等于resLen
+        if (j === resLen) {
+          res.push(array[i])
+        }
+      }
+      return res
     },
+
     export_detail() {
       let params = {
         start_time: this.start_time,
@@ -684,8 +850,8 @@ export default {
 
             let time = "";
             if (
-              order.his_patient != null &&
-              order.his_patient.number.length > 0
+                order.his_patient != null &&
+                order.his_patient.number.length > 0
             ) {
               number = order.his_patient.number;
             }
@@ -705,9 +871,9 @@ export default {
             }
 
             if (
-              order.p_info != null &&
-              order.p_info.department != null &&
-              order.p_info.department.name.length > 0
+                order.p_info != null &&
+                order.p_info.department != null &&
+                order.p_info.department.name.length > 0
             ) {
               department = order.p_info.department.name;
             }
@@ -932,20 +1098,20 @@ export default {
               let name = "";
               let selfpay_prop = "";
               if (
-                order.order_info[b].advice.id == 0 &&
-                order.order_info[b].project.id > 0
+                  order.order_info[b].advice.id == 0 &&
+                  order.order_info[b].project.id > 0
               ) {
                 item_name = order.order_info[b].project.project.project_name;
                 item_code = order.order_info[b].project.project.medical_code;
                 price = order.order_info[b].pric;
                 unit = order.order_info[b].project.project.unit;
               } else if (
-                order.order_info[b].advice.id > 0 &&
-                order.order_info[b].project.id == 0
+                  order.order_info[b].advice.id > 0 &&
+                  order.order_info[b].project.id == 0
               ) {
                 item_name = order.order_info[b].advice.advice_name;
                 item_code =
-                  order.order_info[b].advice.drug.medical_insurance_number;
+                    order.order_info[b].advice.drug.medical_insurance_number;
                 price = order.order_info[b].pric;
                 unit = order.order_info[b].advice.prescribing_number_unit;
               }
@@ -1008,7 +1174,7 @@ export default {
     },
     toDetail(row) {
       this.$router.push(
-        "/outpatientCharges/summaryDetail?patient_id=" +
+          "/outpatientCharges/summaryDetail?patient_id=" +
           row.patient.id +
           "&number=" +
           row.number +

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -445,7 +445,7 @@ export default {
     },
 
     // 电子病历打印
-    opentwo(index) {
+    opentwo(index) {  
       if (index == 1) {
         if (this.patientInfo.id == undefined) {
           this.$message.error('请先选择病人')

src/xt_pages/outpatientDoctorStation/recordPrint.vue

@@ -13,7 +13,13 @@
 
     <div class="dialysisPage" style="padding-top: 40px">
       <printOne
-        v-if="org_id != 10217 && org_id != 9675 && org_id != 9671 && org_id != 0 &&org_id != 10164 && org_id == 10188"
+        v-if="
+          org_id != 10217 && org_id != 10188 &&org_id != 10318&&
+          org_id != 9675 &&
+          org_id != 9671 &&
+          org_id != 0 &&
+          org_id != 10164 
+        "
         ref="printOne"
         v-bind:childResponse="childResponse"
         :patient="patient"
@@ -23,7 +29,12 @@
       ></printOne>
       <printTwo
         v-if="
-          org_id == 10217 || org_id == 0 || org_id == 9675 || org_id == 9671 || org_id == 10164 ||org_id == 10188
+          org_id == 10217 ||
+           org_id == 10188 ||
+          org_id == 9675 ||
+          org_id == 9671 ||
+          org_id == 10164
+         
         "
         ref="printTwo"
         v-bind:childResponse="childResponse"
@@ -32,6 +43,16 @@
         :history="history"
         :patientid="patientid"
       ></printTwo>
+      <printThree
+        v-if="org_id == 10318 || org_id == 0"
+        ref="printThree"
+        v-bind:childResponse="childResponse"
+        :patient="patient"
+        :hispatient="hispatient"
+        :history="history"
+        :patientid="patientid"
+      >
+      </printThree>
     </div>
   </div>
 </template>
@@ -46,12 +67,14 @@ import { getSchedulePatientList } from "@/api/his/his";
 import { getPatientCaseHistory } from "@/api/project/project";
 import printOne from "./recordTemplate/printOne";
 import printTwo from "./recordTemplate/printTwo";
+import printThree from "./recordTemplate/printThree";
 export default {
   name: "dialysisPrintOrder",
   components: {
     BreadCrumb,
     printOne,
     printTwo,
+    printThree,
   },
   props: {
     patientid: Number,
@@ -77,8 +100,10 @@ export default {
   methods: {
     show(val, id) {
       this.org_id = id;
-      if (id == 10217 || id == 9675 || id == 9671 || id == 0) {
+      if (id == 10217 || id == 9675 || id == 9671|| id == 10188 ) {
         this.$refs.printTwo.show(val);
+      } else if (id == 10318|| id == 0) {
+        this.$refs.printThree.show(val);
       } else {
         this.$refs.printOne.show(val);
       }
@@ -105,6 +130,8 @@ export default {
       }
       return "";
     },
+
+    
     printThisPage() {
       var ptime = Math.round(new Date().getTime() / 1000);
       this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
@@ -113,8 +140,10 @@ export default {
         "@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;margin-top:10px;padding:0 10px;}.infoTitle div{width: 200px;}.otherInfo{display: flex;margin-top:20px;padding:0 10px;}.otherInfo span{display:inline-block;}.recordTitle{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;border-bottom: 2px solid #000;}.recordTitle div{width: 200px;}}";
       const style1 =
         "@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;} .infoTitle div{width: 200px;} .infoTitle .address_slot{width: 400px;} .infoTitle .name_slot{width: 250px;}.otherInfo{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;}.otherInfo span{display:inline-block;}.recordTitle{display: flex;justify-content: center;flex-direction: column;margin-top:10px;line-height: 24px;padding:0 10px;border-top: 1px solid;}.recordTitle div{width: 100%;text-align: center;} .recordTitle .recordContent{width: 100%;height: fit-content;min-height: 150px;text-align: left;} .endInfo{display: flex;flex-direction: column;justify-content: end;margin-top: 10px;line-height: 24px;} .endInfo div{width: 300px;} .record_Title{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;border-bottom: 2px solid #000;} .record_Title div{width: 200px;}}";
+      const style2 =
+        "@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;padding-bottom: 10px;border-bottom: 1px solid;}.infoTitle{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;} .infoTitle div{width: 200px;} .infoTitle .address_slot{width: 400px;} .infoTitle .name_slot {width: 300px;display: flex;}.name_slot span {display: inline-block;min-width: 70px;border-bottom: 1px solid;} .infoTitle .name_slot_2 {width: 250px;display: flex;} .name_slot_2 .name_slot_1{  display: inline-block;min-width: 70px;border-bottom: 1px solid;} .infoTitle .full_slot {width: 100%;}.infoTitle .full_slot .id_card{border: 1px solid;display: inline-block;width: 18px;height: 18px;text-align: center;margin-right: 6px;} .address_slot_1 span {display: inline-block;min-width: 60px;border-bottom: 1px solid;} .otherInfo{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;}.otherInfo span{display:inline-block;}.recordTitle{display: flex;justify-content: center;flex-direction: column;margin-top:10px;line-height: 24px;padding:0 10px;border-top: 1px solid;}.recordTitle div{width: 100%;text-align: center;} .recordTitle .recordContent{width: 100%;height: fit-content;min-height: 150px;text-align: left;} .endInfo{display: flex;flex-direction: column;justify-content: end;margin-top: 10px;line-height: 24px;} .endInfo div{width: 300px;} .record_Title{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;border-bottom: 2px solid #000;} .record_Title div{width: 200px;}}";
 
-      if (this.org_id != 10217 && this.org_id != 0 && this.org_id != 9675) {
+      if (this.org_id != 10217 && this.org_id != 0 && this.org_id != 9675 && this.org_id != 10318 &&this.org_id != 10188) {
         printJS({
           printable: "prescription-print",
           type: "html",
@@ -123,8 +152,8 @@ export default {
         });
       } else if (
         this.org_id == 10217 ||
-        this.org_id == 0 ||
-        this.org_id == 9675
+        this.org_id == 9675 ||
+        this.org_id == 10188
       ) {
         printJS({
           printable: "prescription-print",
@@ -132,6 +161,14 @@ export default {
           style: style1,
           scanStyles: false,
         });
+      }else if(this.org_id == 10318||this.org_id == 0 )
+      {
+        printJS({
+          printable: "prescription-print",
+          type: "html",
+          style: style2,
+          scanStyles: false,
+        });
       }
     },
 

src/xt_pages/outpatientDoctorStation/recordTemplate/printThree.vue

@@ -0,0 +1,654 @@
+<template>
+  <div id="prescription-print">
+    <div class="prescription-print">
+      <div class="printTitle">{{ orgname }}门诊血液净化治疗病历首页</div>
+      <!-- <div class="record_Title">
+            <div>年龄：{{patient.age?patient.age:''}}岁</div>
+            <div>透析病历号:{{patient.id?patient.id:''}}</div>
+        </div> -->
+      <div class="infoTitle" style="margin-top: 20px">
+        <div class="name_slot">
+          首次治疗日期：<span>{{ getTime(patient.first_dialysis_date) }}</span>
+        </div>
+        <div class="name_slot">医保卡号：<span></span></div>
+        <div class="name_slot">
+          ID号：<span class="name_slot_1" style="min-width: 100px"></span>
+        </div>
+      </div>
+      <div
+        class="infoTitle"
+        style="margin-top: 20px; padding-bottom: 20px; border-bottom: 1px solid"
+      >
+        <div class="name_slot_2" style="width: 273px">
+          诊断：<span class="name_slot_1" style="min-width: 100px"></span>
+        </div>
+        <div class="name_slot" style="width: 640px">
+          合并症或并发症：<span style="width: 220px"></span>
+        </div>
+      </div>
+
+      <div class="infoTitle" style="margin-top: 15px">
+        <div class="name_slot">
+          姓名：<span style="min-width: 180px">{{
+            patient.name ? patient.name : ""
+          }}</span>
+        </div>
+        <div>
+          性别：
+<!--          <label-box-->
+<!--            :isChecked="patient.gender == 1 ? true : false"-->
+<!--            showValue="男"-->
+<!--          ></label-box>-->
+<!--          <label-box-->
+<!--            :isChecked="patient.gender == 2 ? true : false"-->
+<!--            showValue="女"-->
+<!--          ></label-box>-->
+        </div>
+        <!-- <div class="address_slot">
+          家庭住址：<span>{{ patient.home_address ? patient.home_address : "" }}</span>
+        </div> -->
+      </div>
+
+      <div class="infoTitle">
+        <div class="full_slot">
+          身份证号：
+          <span class="id_card" v-for="i in patient.id_card_no" :key="i">{{
+            i
+          }}</span>
+        </div>
+      </div>
+
+      <div class="infoTitle">
+        <div class="address_slot_1" style="width: 100%">
+          现住址（详填）<span></span>省<span></span>市<span></span>区<span
+            style="min-width: 190px"
+          ></span>
+        </div>
+      </div>
+      <div class="infoTitle">
+        <div class="address_slot_1" style="width: 100%">
+          户口住址（详填）<span></span>省<span></span>市<span
+          ></span>县（区）<span style="min-width: 135px"></span>
+        </div>
+      </div>
+      <div class="infoTitle">
+        <div class="address_slot_1" style="width: 100%">
+          工作单位：<span>{{ patient.work_unit }}</span
+          >地址：<span></span>省<span></span>市/县<span
+            style="min-width: 174px"
+          ></span>
+        </div>
+      </div>
+      <div class="infoTitle">
+        <div class="name_slot">
+          电话：<span>{{ patient.phone ? patient.phone : "" }}</span>
+        </div>
+        <div class="name_slot">手机：<span></span></div>
+        <div class="name_slot">
+          联系人：<span>{{ patient.contact_name }}</span>
+        </div>
+        <div class="name_slot">关系：<span></span></div>
+      </div>
+
+      <table class="print-table" border="1" style="margin-top: 20px">
+        <thead>
+          <tr>
+            <td colspan="2">干体重</td>
+            <td colspan="2">血管通路</td>
+            <td colspan="2">抗凝剂</td>
+          </tr>
+          <tr>
+            <td>日期</td>
+            <td>体重（kg）</td>
+            <td>日期</td>
+            <td>名称</td>
+            <td>日期</td>
+            <td>种类</td>
+          </tr>
+        </thead>
+        <tbody class="print-table-body">
+          <tr v-for="(index, el) in table_list" :key="index">
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>
+              <table class="print-table-no" border="1">
+                <tr>
+                  <td rowspan="6">传 <br />染<br />病<br />等<br />级</td>
+                  <td>日期</td>
+                </tr>
+                <tr v-for="(index, list) in table_list_child" :key="index">
+                  <td></td>
+                </tr>
+                <tr></tr>
+              </table>
+            </td>
+            <td>
+              <table class="print-table-no-1" border="1">
+                <tr class="no-1-tr">
+                  <td>名称</td>
+                </tr>
+                <tr v-for="(index, list) in table_list_child" :key="index">
+                  <td></td>
+                </tr>
+                <tr></tr>
+              </table>
+            </td>
+
+            <td>
+              <table class="print-table-no" border="1">
+                <tr>
+                  <td rowspan="6" style="line-height: 50px">
+                    肿<br />瘤<br />登<br />记<br />
+                  </td>
+                  <td>日期</td>
+                </tr>
+                <tr v-for="(index, list) in table_list_child" :key="index">
+                  <td></td>
+                </tr>
+                <tr></tr>
+              </table>
+            </td>
+            <td>
+              <table class="print-table-no-1" border="1">
+                <tr class="no-1-tr">
+                  <td>名称</td>
+                </tr>
+                <tr v-for="(index, list) in table_list_child" :key="index">
+                  <td></td>
+                </tr>
+                <tr></tr>
+              </table>
+            </td>
+
+            <td>
+              <table class="print-table-no" border="1">
+                <tr>
+                  <td rowspan="6" style="line-height: 50px">
+                    过<br />敏<br />反<br />应<br />
+                  </td>
+                  <td>日期</td>
+                </tr>
+                <tr v-for="(index, list) in table_list_child" :key="index">
+                  <td></td>
+                </tr>
+                <tr></tr>
+              </table>
+            </td>
+            <td>
+              <table class="print-table-no-1" border="1">
+                <tr class="no-1-tr">
+                  <td>药物反应</td>
+                </tr>
+                <tr v-for="(index, list) in table_list_child" :key="index">
+                  <td></td>
+                </tr>
+                <tr></tr>
+              </table>
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <div class="printTitle" style="border-bottom: none">
+      {{ orgname }}血液透析治疗方案调整
+    </div>
+    <table class="print-table-end" border="1" style="margin-top: 20px">
+      <thead>
+        <tr>
+          <td width="12.5%">治疗频率</td>
+          <td width="12.5%">调整日期</td>
+          <td>治疗方式</td>
+          <td>调整日期</td>
+          <td>钙浓度</td>
+          <td>调整日期</td>
+          <td>钾浓度</td>
+          <td width="12.5%">调整日期</td>
+        </tr>
+      </thead>
+
+      <tbody>
+        <tr v-for="(index, item) in tablelist_2" :key="index">
+          <td></td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td></td>
+        </tr>
+      </tbody>
+    </table>
+    <!-- <div class="prescription-print">
+      <div class="recordTitle">
+        <div>体格检查</div>
+        <div
+          class="recordContent"
+          style="height: fit-content; min-height: 250px"
+        >
+          <div>
+            <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="text-align: left">
+            {{ history.physical_examination }}
+          </div>
+        </div>
+      </div>
+      <div class="recordTitle">
+        <div>专科检查</div>
+        <div class="recordContent">{{ history.special_inspection }}</div>
+      </div>
+      <div class="recordTitle" style="border-bottom: 1px solid">
+        <div>实验室及器械检查</div>
+        <div
+          class="recordContent"
+          style="height: fit-content; min-height: 250px"
+        >
+          {{ history.lab_apparatus }}
+        </div>
+      </div>
+      <div style="display: flex; justify-content: flex-end">
+        <div class="endInfo">
+          <div style="height: 100px">
+            诊断：{{ history.diagnostic ? history.diagnostic : "" }}
+          </div>
+          <div style="display: flex">
+            <div>
+              医师：{{
+                getDoctor(history.doctor) ? getDoctor(history.doctor) : ""
+              }}
+            </div>
+            <div>手签：</div>
+          </div>
+          <div
+            style="text-align: center; letter-spacing: 3px; padding-top: 20px"
+          >
+            {{ getTime(history.record_date) }}
+          </div>
+        </div>
+      </div>
+    </div> -->
+  </div>
+</template>
+<script>
+import { jsGetAge, uParseTime } from "@/utils/tools";
+
+import { getDataConfig } from "@/utils/data";
+import { getAllDoctorList, getPatientCaseHistory } from "@/api/project/project";
+import { getAccessList } from "@/api/patient";
+// import LabelBox from "../zujian/labelbox.vue";
+// import CheckBox from "../zujian/checkbox.vue";
+export default {
+  props: {
+    patient: Object,
+    hispatient: Object,
+    patientid: Number,
+    //   history:Object,
+  },
+  components: {
+    // LabelBox,
+    // CheckBox,
+  },
+  data() {
+    return {
+      educationOptions: [],
+      departmentList: [],
+      orgname: "",
+      history: {},
+      printDate: "",
+      accessList: {},
+      blood_access_part_opera: [],
+      table_list: [],
+      table_list_child: [],
+      tablelist_2: [],
+    };
+  },
+
+  methods: {
+    // 默认表格行数
+    gettable() {
+      let obj = {
+        date1: "2020-06-28",
+        weight: "00",
+        date2: "2020-06-28",
+        name: "hh",
+        date3: "2020-06-28",
+        type: "ss",
+      };
+      if (this.table_list.length < 12) {
+        var nl = 12 - this.table_list.length;
+        for (let index = 0; index < nl; index++) {
+          this.table_list.push([]);
+        }
+      }
+      if (this.table_list_child.length < 5) {
+        var nl = 5 - this.table_list_child.length;
+        for (let index = 0; index < nl; index++) {
+          this.table_list_child.push([]);
+        }
+      }
+
+      if (this.tablelist_2.length < 5) {
+        var nl = 5 - this.tablelist_2.length;
+        for (let index = 0; index < nl; index++) {
+          this.tablelist_2.push([]);
+        }
+      }
+      console.log(this.table_list, "this.table_list");
+    },
+
+    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, "-");
+    },
+    show(val) {
+      this.patientid = val;
+      this.getAllDoctorList();
+      this.getPatientCaseHistory();
+    },
+    getProfession(id) {
+      var name = "";
+      for (let i = 0; i < this.educationOptions.length; i++) {
+        if (id == this.educationOptions[i].id) {
+          name = this.educationOptions[i].name;
+        }
+      }
+      return name;
+    },
+    getAllDoctorList() {
+      getAllDoctorList().then((response) => {
+        if (response.data.state == 1) {
+          var doctor = response.data.data.doctor;
+
+          this.doctorList = doctor;
+          var department = response.data.data.department;
+          this.departmentList = department;
+        }
+      });
+    },
+    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;
+    },
+    getPatientCaseHistory() {
+      const params = {
+        patient_id: this.patientid,
+      };
+      getPatientCaseHistory(params).then((response) => {
+        if (response.data.state == 1) {
+          var patient = response.data.data.patient;
+          this.patient = patient;
+          var history = response.data.data.history;
+          this.history = history;
+          var hispatient = response.data.data.hispatient;
+          this.hispatient = hispatient;
+          var accessList = response.data.data.accessList;
+          this.accessList = accessList;
+        }
+      });
+    },
+    getDeparment(id) {
+      var name = "";
+      for (let i = 0; i < this.departmentList.length; i++) {
+        if (id == this.departmentList[i].id) {
+          name = this.departmentList[i].name;
+        }
+      }
+      return name;
+    },
+    getTime(val) {
+      if (val < 0) {
+        return "";
+      }
+      if (val == "") {
+        return "";
+      } else {
+        return uParseTime(val, "{y}-{m}-{d}");
+      }
+    },
+    getAccessList() {
+      getAccessList().then((response) => {
+        if (response.data.state == 1) {
+          var blood_access_part_opera =
+            response.data.data.blood_access_part_opera;
+          this.blood_access_part_opera = blood_access_part_opera;
+        }
+      });
+    },
+    getAccess(id) {
+      var name = "";
+      for (let i = 0; i < this.blood_access_part_opera.length; i++) {
+        if (id == this.blood_access_part_opera[i].value) {
+          name = this.blood_access_part_opera[i].name;
+        }
+      }
+      return name;
+    },
+  },
+  created() {
+    this.gettable();
+    this.educationOptions = getDataConfig("patient", "education_types");
+    // this.getAllDoctorList();
+    // this.getPatientCaseHistory();
+    // this.getAccessList();
+    var xtuser = this.$store.getters.xt_user;
+    this.orgname = xtuser.org.org_name;
+    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;
+  },
+};
+</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;
+}
+.printTitle {
+  font-size: 22px;
+  text-align: center;
+  font-weight: bold;
+  padding-bottom: 10px;
+  border-bottom: 1px solid;
+}
+.infoTitle {
+  display: flex;
+  margin-top: 10px;
+  line-height: 24px;
+  padding: 0 10px;
+}
+.infoTitle div {
+  width: 200px;
+}
+
+.infoTitle .address_slot {
+  width: 400px;
+}
+.infoTitle .full_slot {
+  width: 100%;
+}
+
+.infoTitle .full_slot .id_card {
+  border: 1px solid;
+  display: inline-block;
+  width: 18px;
+  height: 18px;
+  text-align: center;
+  margin-right: 6px;
+}
+
+.infoTitle .name_slot {
+  width: 250px;
+  display: flex;
+}
+
+// .name_slot_2{
+//     min-width: 100px;
+//     display: inline-block;
+//     border-bottom: 1px solid;
+// }
+.name_slot_1 {
+  display: inline-block;
+  min-width: 70px;
+  border-bottom: 1px solid;
+}
+
+.name_slot span {
+  display: inline-block;
+  min-width: 70px;
+  border-bottom: 1px solid;
+}
+
+.address_slot_1 span {
+  display: inline-block;
+  min-width: 60px;
+  border-bottom: 1px solid;
+}
+
+.otherInfo {
+  display: flex;
+  margin-top: 10px;
+  line-height: 24px;
+  padding: 0 10px;
+}
+.endInfo {
+  display: flex;
+  flex-direction: column;
+  justify-content: end;
+  margin-top: 10px;
+  line-height: 24px;
+}
+.endInfo div {
+  width: 300px;
+}
+.recordTitle {
+  display: flex;
+  justify-content: center;
+  flex-direction: column;
+  margin-top: 10px;
+  line-height: 24px;
+  padding: 0 10px;
+  border-top: 1px solid;
+}
+.recordTitle div {
+  width: 100%;
+  text-align: center;
+}
+.recordTitle .recordContent {
+  width: 100%;
+  height: fit-content;
+  min-height: 150px;
+  text-align: left;
+}
+
+.record_Title {
+  display: flex;
+  margin-top: 10px;
+  line-height: 24px;
+  padding: 0 10px;
+  border-bottom: 2px solid #000;
+}
+
+.record_Title div {
+  width: 200px;
+}
+
+.print-table {
+  width: 100%;
+  text-align: center;
+  border-collapse: collapse;
+  line-height: 40px;
+  font-size: 14px;
+}
+
+.print-table thead tr td {
+  width: 16%;
+}
+
+.print-table-body tr td {
+  height: 25px;
+}
+
+.print-table-no {
+  width: 100%;
+  text-align: center;
+  border-collapse: collapse;
+  line-height: 40px;
+  font-size: 14px;
+}
+.print-table-no-1 {
+  height: 100%;
+  width: 100%;
+  text-align: center;
+  border-collapse: collapse;
+  line-height: 40px;
+  font-size: 14px;
+}
+
+.print-table-no-1 tr {
+  height: 1px;
+}
+
+.print-table-no-1 .no-1-tr {
+  height: 41px;
+}
+
+.print-table-end {
+  width: 100%;
+  text-align: center;
+  border-collapse: collapse;
+  line-height: 40px;
+  font-size: 14px;
+}
+
+.print-table-end tbody tr td {
+  height: 25px;
+}
+
+
+</style>

src/xt_pages/outpatientDoctorStation/zujian/checkbox.vue

@@ -0,0 +1,54 @@
+<template>
+    <label class="option_panel">
+        <span class="check_box_panel">
+            <span class="check_box" :class="{ 'did_checked': checked, }"></span>
+        </span>
+        <span>{{ text }}</span>
+    </label>
+</template>
+
+<script>
+export default {
+    name: "OptionCheckBox",
+    props: {
+        text: {
+            type: String,
+        },
+        checked: {
+            type: Boolean,
+            default: false,
+        }
+    }
+}
+</script>
+
+
+<style scoped>
+.option_panel {
+    margin: 0 5px 0 0;
+    /* font-size: 16px; */
+}
+.option_panel .check_box_panel {
+    white-space: nowrap;
+    outline: none;
+    display: inline-block;
+    line-height: 1;
+    position: relative;
+    vertical-align: middle;
+}
+.option_panel .check_box_panel .check_box {
+    display: inline-block;
+    position: relative;
+    border: 1px solid #000;
+    box-sizing: border-box;
+    width: 14px;
+    height: 14px;
+    background-color: #fff;
+}
+.check_box_panel .did_checked::after {
+    content: "√";
+    font-size: 10px;
+    margin-left: 2px;
+    position: absolute;
+}
+</style>

src/xt_pages/outpatientDoctorStation/zujian/labelbox.vue

@@ -0,0 +1,73 @@
+<template >
+  <label class="radio-lebel-box">
+    <span class="radio-inner">
+        <span class="radio-fang " :class="{'is-checked-radio':isChecked}"></span>
+        <input  type="radio" class="radio-no" :checked='isChecked' >
+    </span>
+    <span v-html="showValue"> </span>
+  </label>
+</template>
+
+<script>
+  export default {
+
+    name: "labelBox",
+    props: {
+      isChecked:{
+        type:Boolean,
+        default:false,
+      },
+      showValue:{
+        type:String,
+        default:'',
+      },
+    },
+    data() {
+      return {
+      }
+    },
+    methods:{
+
+    }
+  }
+</script>
+
+<style scoped>
+.radio-lebel-box {
+    font-weight: 400;
+    cursor: pointer;
+}
+.radio-inner {
+    white-space: nowrap;
+    cursor: pointer;
+    outline: none;
+    display: inline-block;
+    line-height: 1;
+    position: relative;
+    vertical-align: middle;
+}
+.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);
+}
+.is-checked-radio::after {
+    content: "√";
+    font-size: 15px;
+}
+.radio-no {
+    opacity: 0;
+    outline: none;
+    position: absolute;
+    margin: 0;
+    width: 0;
+    height: 0;
+    z-index: -1;
+}
+</style>

src/xt_pages/outpatientTool/components/detailStatistics.vue

@@ -168,6 +168,7 @@
       <div>总费用:{{ getAllPice() }}</div>
       <div>
         个人支付: 
+       
         <span v-if="his_patient.balance_accounts_type == 2">{{ getAllPice() }}</span>  
         <span v-if="his_patient.balance_accounts_type != 2">{{ getActPay() }}</span>
       
@@ -330,8 +331,21 @@ export default {
 
           var new_arr = [];
 
-          
+          let list_1 = this.$store.getters.pagedata.list;
+          if (list_1.keywords == undefined) {
+            this.keywords = "";
+          } else {
+            this.keywords = list_1.keywords;
+          }
+          this.id = list_1.type_id;
+          this.item_type = this.id;
+          if(this.item_type == undefined){
+            this.item_type = "0"
+          }else{
+            this.item_type = this.id;
+          }
 
+          
           if (this.keywords != "") {
             for (let i = 0; i < this.tableData.length; i++) {
               if (this.tableData[i].index != "合计") {
@@ -433,7 +447,7 @@ export default {
       var act_pay = 0;
       for (let i = 0; i < this.list.length; i++) {
         for (let j = 0; j < this.list[i].orders.length; j++) {
-          act_pay += this.list[i].orders[j].acct_pay;
+          act_pay += this.list[i].orders[j].psn_cash_pay;
         }
       }
       return act_pay.toFixed(2);
@@ -522,13 +536,13 @@ export default {
   },
   created() {
     let list_1 = this.$store.getters.pagedata.list;
-          if (list_1.start_time == "") {
-            this.chargeDate[0] = "";
+          if (!list_1.start_time ||list_1.start_time == "") {
+            this.chargeDate[0] = this.chargeDate[0] = moment(new Date()).add("year", 0).format("YYYY-MM-DD");;
           } else {
             this.chargeDate[0] = list_1.start_time;
           }
-           if (list_1.end_time == "") {
-            this.chargeDate[1] = "";
+           if (!list_1.end_time ||list_1.end_time == "") {
+            this.chargeDate[1] = this.chargeDate[0] = moment(new Date()).add("year", 0).format("YYYY-MM-DD");;
           } else {
             this.chargeDate[1] = list_1.end_time;
           }

src/xt_pages/outpatientTool/components/gatherStatistics.vue

@@ -234,7 +234,7 @@ export default {
   },
   methods: {
     searchAction() {
-     let table_id = this.$store.getters.pagedata.list.table_id;
+      let table_id = this.$store.getters.pagedata.list.table_id;
       if (table_id == undefined) {
         this.$store.commit("SET_PAGEDATA", {
           table_id: 0,
@@ -256,7 +256,7 @@ export default {
       }
       this.tableList = [];
       this.getGatherDetailList();
-      console.log(this.tableList, "查看条约");
+      // console.log(this.tableList, "查看条约");
     },
     getPrice(val) {
       var total_price = 0;
@@ -447,19 +447,26 @@ export default {
             this.keywords = list_1.keywords;
           }
           this.id = list_1.type_id;
-          this.item_type = this.id
+          this.item_type = this.id;
+          if(this.item_type == undefined){
+            this.item_type = "0"
+          }else{
+            this.item_type = this.id;
+          }
+          console.log(this.item_type,'this.item_type')
+          
 
-          if(this.keywords!=""){
-          for(let i=0;i<this.tableList.length;i++){
-          if(this.tableList[i].name.indexOf(this.keywords) >-1){
-              new_arr.push(this.tableList[i])
+          if (this.keywords != "") {
+            for (let i = 0; i < this.tableList.length; i++) {
+              if (this.tableList[i].name.indexOf(this.keywords) > -1) {
+                new_arr.push(this.tableList[i]);
+              }
+            }
+            var obj = { index: "合计", is_total: 1, total: 0 };
+            obj.total = this.getPrice(new_arr);
+            this.tableList = [];
+            this.tableList = new_arr;
           }
-        }
-        var obj ={index:"合计",is_total:1,total:0}
-        obj.total = this.getPrice(new_arr)
-        this.tableList = []
-        this.tableList = new_arr
-      }
           if (this.id == 1) {
             var new_arr = [];
             for (let i = 0; i < this.tableList.length; i++) {
@@ -820,7 +827,7 @@ export default {
           "&id=" +
           this.id,
       });
-        let table_id = this.$store.getters.pagedata.list.table_id;
+      let table_id = this.$store.getters.pagedata.list.table_id;
       if (table_id == undefined) {
         this.$store.commit("SET_PAGEDATA", {
           table_id: 0,
@@ -1247,16 +1254,21 @@ export default {
   },
   created() {
     let list_1 = this.$store.getters.pagedata.list;
-          if (list_1.start_time == "") {
-            this.chargeDate[0] = "";
-          } else {
-            this.chargeDate[0] = list_1.start_time;
-          }
-           if (list_1.end_time == "") {
-            this.chargeDate[1] = "";
-          } else {
-            this.chargeDate[1] = list_1.end_time;
+    if (!list_1.start_time || list_1.start_time == "") {
+      this.chargeDate[0] = moment(new Date())
+        .add("year", 0)
+        .format("YYYY-MM-DD");
+    } else {
+      this.chargeDate[0] = list_1.start_time;
     }
+    if (!list_1.end_time || list_1.end_time == "") {
+      this.chargeDate[1] = moment(new Date())
+        .add("year", 0)
+        .format("YYYY-MM-DD");
+    } else {
+      this.chargeDate[1] = list_1.end_time;
+    }
+
     this.start_time = this.chargeDate[0];
     this.end_time = this.chargeDate[1];
     this.tableList = [];

src/xt_pages/outpatientTool/detailPrint.vue

@@ -4,48 +4,94 @@
       <el-button type="primary" @click="printtpage">打印</el-button>
     </div>
     <div id="list-print" class="list-print">
-      <div class="listTitle">
+      <table class="listTable"
+        border="0"
+        cellspacing="0"
+        style="font-size: 14px"
+        align="center">
+        <thead style="display: table-header-group; font-weight: bold;border-bottom: 1px solid;">
+          <tr
+            ><td colspan="4" align="center" style="font-size: 20px"
+              >{{ $store.getters.xt_user.org.org_name }}费用清单</td
+            ></tr
+          >
+          <tr>
+            <td>患者姓名：{{ patient.name }}</td>
+            <td>性别：{{ patient.gender == 1 ? "男" : "女" }}</td>
+            <td>结算类别：
+          <!-- {{ getType(his_patient.balance_accounts_type) }} -->
+          {{getType(his_record_patient.balance_accounts_type)}}</td>
+            <td>发票号码：{{order.fa_piao_number}}</td>
+          </tr>
+          <tr>
+            <td>住院/门诊号：
+          <!-- {{his_patient.number}} -->
+          {{his_record_patient.ipt_otp_no}}</td>
+            <td>科室：
+          <!-- {{ getDepartment(his_patient.departments) }} -->
+          {{ getDepartment(his_record_patient.departments) }}</td>
+            <td>就诊流水号：
+          <!-- {{ his_patient.number }} -->
+          {{his_record_patient.number}}</td>
+          </tr>
+          <tr>
+            <td>总费用：{{ getAllPice() }}</td>
+            <td>个人支付：
+          <!-- <span v-if="this.$route.query.balance_accounts_type == 2 && his_patient.id >0">{{ getAllPice() }}</span>
+          <span v-if="this.$route.query.balance_accounts_type != 2 && his_patient.id >0">{{ getActPay() }}</span> -->
+          
+          <span v-if="his_record_patient.balance_accounts_type == 2">{{ getAllPice() }}</span>
+          <span v-if="his_record_patient.balance_accounts_type != 2">{{ getActPay() }}</span>
+            </td>
+            <td>基金支付记账：{{ getFundPaySumamt() }}</td>
+            <td>补充医疗支付记账：{{ getHifesPay() }}</td>
+          </tr>
+          <tr>
+            <td>
+              救助支付金额：{{ getMafPay() }}
+            </td>
+          </tr>
+        </thead>
+      </table>
+
+      <!-- <div class="listTitle">
         {{ $store.getters.xt_user.org.org_name }}费用清单
-      </div>
-      <div class="listInfo">
+      </div> -->
+
+      <!-- <div class="listInfo">
         <div>患者姓名：{{ patient.name }}</div>
         <div>性别：{{ patient.gender == 1 ? "男" : "女" }}</div>
         <div>结算类别：
-          <!-- {{ getType(his_patient.balance_accounts_type) }} -->
+          
           {{getType(his_record_patient.balance_accounts_type)}}
         </div>
         <div style="min-width:300px;">发票号码：{{order.fa_piao_number}}</div>
-      </div>
-      <div class="listInfo">
+      </div> -->
+      <!-- <div class="listInfo">
         <div>住院/门诊号：
-          <!-- {{his_patient.number}} -->
           {{his_record_patient.ipt_otp_no}}
         </div>
         <div>科室：
-          <!-- {{ getDepartment(his_patient.departments) }} -->
           {{ getDepartment(his_record_patient.departments) }}
         </div>
         <div style="min-width:350px;">就诊流水号：
-          <!-- {{ his_patient.number }} -->
+       
           {{his_record_patient.number}}
         </div>
-      </div>
-      <div class="listInfo">
+      </div> -->
+      <!-- <div class="listInfo">
         <div>总费用：{{ getAllPice() }}</div>
         <div>个人支付：
-          <!-- <span v-if="this.$route.query.balance_accounts_type == 2 && his_patient.id >0">{{ getAllPice() }}</span>
-          <span v-if="this.$route.query.balance_accounts_type != 2 && his_patient.id >0">{{ getActPay() }}</span> -->
-          
           <span v-if="his_record_patient.balance_accounts_type == 2">{{ getAllPice() }}</span>
           <span v-if="his_record_patient.balance_accounts_type != 2">{{ getActPay() }}</span>
 
         </div>
         <div>基金支付记账：{{ getFundPaySumamt() }}</div>
         <div style="min-width:300px;">补充医疗支付记账：{{ getHifesPay() }}</div>
-      </div>
-      <div class="listInfo">
+      </div> -->
+      <!-- <div class="listInfo">
         <div>救助支付金额：{{ getMafPay() }}</div>
-      </div>
+      </div> -->
       <table class="listTable" border="1">
         <tr style="height:45px">
           <td width="100" style="text-align: center">序号</td>

src/xt_pages/outpatientTool/export.vue

@@ -0,0 +1,703 @@
+<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="mainLeft">
+        <div>
+          <div
+            style="
+              margin: 10px 0;
+              display: flex;
+              justify-content: space-between;
+            "
+          >
+            <el-input
+              size="small"
+              style="width: 130px"
+              v-model="keywords"
+              class="filter-item"
+              placeholder="请输入患者名称"
+            />
+            <el-button
+              size="small"
+              class="filter-item"
+              type="primary"
+              @click="searchAction"
+              >搜索
+            </el-button>
+          </div>
+
+          <el-table
+            :row-class-name="tableRowClassName"
+            @row-click="onRowClick"
+            :data="patientTableData"
+            :height="tableHeight"
+            border
+            style="width: 100%"
+            :row-style="{ color: '#303133' }"
+            :header-cell-style="{
+              backgroundColor: 'rgb(245, 247, 250)',
+              color: '#606266',
+            }"
+            highlight-current-row
+            ref="singleTable"
+            @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>
+        </div>
+      </div>
+      <div class="mainRight">
+        <el-date-picker
+          v-model="chargeDate"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          range-separator="至"
+          start-placeholder="开始日期"
+          @change="changeDate"
+          end-placeholder="结束日期"
+        >
+        </el-date-picker>
+         <el-button  size="small" type="primary" @click="exportList" style="width:50px">导出</el-button>
+        <el-table
+        :data="tableList"
+         border
+        style="width: 100%">
+         <el-table-column prop="date" label="姓名"  width="100" align="center">
+           <template slot-scope="scope" >
+            {{ scope.row.name }}
+           </template>
+        </el-table-column>
+        <el-table-column  prop="date"  label="身份证"  width="200" align="center">
+           <template slot-scope="scope" >
+            {{ scope.row.id_card_no }}
+           </template> 
+        </el-table-column>
+        <el-table-column prop="name"  label="医保类型" width="100" align="center">
+          <template slot-scope="scope" >
+            <span v-if="scope.row.insutype == 0">居民</span>
+            <span v-if="scope.row.insutype == 310">职工</span>
+            <span v-if="scope.row.insutype == 390">居民</span>
+           </template>  
+        </el-table-column>
+        <el-table-column  prop="address" label="年"  width="50" align="center">
+          <template slot-scope="scope" >
+            {{getTime(scope.row.settle_accounts_date)}}
+         </template>  
+        </el-table-column>
+         <el-table-column prop="address" label="月"  width="50"  align="center">
+          <template slot-scope="scope">
+            {{getTimeOne(scope.row.settle_accounts_date)}}
+           </template>  
+        </el-table-column>
+         <el-table-column prop="address" label="收费项目"  width="100" align="center">
+           <template slot-scope="scope" >
+            <!-- {{getTime(scope.row.settle_accounts_date)}} -->
+            <span v-if="scope.row.med_chrgitm_type == '01'">床位费</span>
+            <span v-if="scope.row.med_chrgitm_type == '02'">诊察费</span>
+            <span v-if="scope.row.med_chrgitm_type == '03'">检查费</span>
+            <span v-if="scope.row.med_chrgitm_type == '04'">化验费</span>
+            <span v-if="scope.row.med_chrgitm_type == '05'">治疗费</span>
+            <span v-if="scope.row.med_chrgitm_type == '06'">手术费</span>
+            <span v-if="scope.row.med_chrgitm_type == '08'">材料费</span>
+            <span v-if="scope.row.med_chrgitm_type == '09'">西药费</span>
+            <span v-if="scope.row.med_chrgitm_type == '11'">中成费</span>
+            <span v-if="scope.row.med_chrgitm_type == '14'">其他费</span>
+           </template>  
+        </el-table-column>
+         <el-table-column prop="address" label="数量"  width="100" align="center">
+           <template slot-scope="scope" >
+            {{getCount(scope.row.child)}}
+           </template>  
+          </el-table-column>
+       
+         <el-table-column  prop="address"  label="金额"  width="130" align="center">
+         <template slot-scope="scope" >
+            {{getAllPrice(scope.row.child)}}
+           </template>  
+        </el-table-column>
+         </el-table>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { GetDetailPatients,getHisOrderList } from "@/api/his/his_tools";
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
+const moment = require("moment");
+import { uParseTime } from '@/utils/tools'
+export default {
+  components: {
+    BreadCrumb,
+  },
+  data() {
+    return {
+      currentRowIndex: 0,
+      patientTableData: [],
+      tableHeight: 400,
+      crumbs: [
+        { path: false, name: "His工具" },
+        { path: false, name: "明细汇总统计" },
+      ],
+      titleType: "明细",
+      patient_id: 0,
+      keywords: "",
+      tableList:[],
+      tableData:[],
+     chargeDate: [
+        moment(new Date()).add("year", 0).format("YYYY-MM-DD"),
+        moment(new Date()).add("year", 0).format("YYYY-MM-DD"),
+      ],
+      start_time:"",
+      end_time:"",
+
+    };
+  },
+
+  // beforeRouteEnter(to, from, next){
+  //     if(from.path == '/hisTool/detailPrint'){
+  //       next((vm) => {
+  //         vm.titleType = "明细"
+  //       })
+  //     }else if(from.path == '/hisTool/gatherPrint'){
+  //       vm.titleType = "汇总"
+  //       next((vm) => {
+  //         vm.titleType = "汇总"
+  //       })
+  //     }else{
+  //       next()
+  //     }
+  // },
+
+  //判断列表页是否刷新
+  beforeRouteLeave(to, from, next) {
+    console.log(to, "beforeRouteEnter");
+    if (to.path != "/hisTool/detailPrint"&&to.path != "/hisTool/gatherPrint") {
+      this.$store.getters.pagedata.list.table_id = 0
+      next()
+    } else {
+     next()
+    }
+  },
+
+  watch:{
+    'titleType':{
+      handler(val){
+        this.$store.commit('SET_PAGENAME',val)
+      }
+    }
+  },
+
+  methods: {
+    getPatientList() {
+      var params = {
+        keyword: this.keywords,
+      };
+      GetDetailPatients(params).then((response) => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.patientTableData = response.data.data.patient;
+          this.patient_id = this.patientTableData[0].id;
+          if (this.$store.getters.pagedata.list.table_id == 0) {
+            this.$refs.singleTable.setCurrentRow(this.patientTableData[0]);
+          } else {
+            this.$refs.singleTable.setCurrentRow(
+              this.patientTableData[
+                this.$store.getters.pagedata.list.table_id
+              ]
+            );
+          }
+        }
+      });
+    },
+
+    tableRowClassName({ row, rowIndex }) {
+      row.row_index = rowIndex;
+    },
+
+    onRowClick(row, event, column) {
+      this.currentRowIndex = row.row_index;
+      this.$store.commit("SET_PAGEDATA", {
+        table_id: this.currentRowIndex,
+      });
+      // console.log(this.$store.getters.pagedata.list.table_id, "列表行id");
+    },
+    searchAction() {
+      this.getPatientList();
+    },
+    handleCurrentChange(row) {
+      this.patient_id = row.id;
+      this.tableList = []
+      this.tableData = []
+      this.getHisOrderList(row.id)
+    },
+    getHisOrderList(id){
+       var params = {
+        patient_id:id,
+        start_time:this.start_time,
+        end_time:this.end_time,
+       } 
+     console.log("params223332233232",params)
+     getHisOrderList(params).then(response=>{
+       if(response.data.state == 1){
+        //  var list = response.data.data.list
+        //  console.log("list23232232323",list)
+         var groupList = response.data.data.groupList
+          
+         var arr = []
+         for(let i=0;i<groupList.length;i++){
+            //已经结算
+           if(groupList[i].order.order_status == 2){
+              arr.push(groupList[i])
+           }
+         }
+         console.log("已结算数据",arr)
+         if(arr.length > 0){
+         let objInfo = {};
+          if(arr.length > 0) {
+             arr.forEach((item, index) => {
+              let { med_chrgitm_type } = item;
+              if (!objInfo[med_chrgitm_type]) {
+                objInfo[med_chrgitm_type] = {
+                  med_chrgitm_type:item.med_chrgitm_type,
+                  child: [],
+                  count: item.cnt,
+                  pric:item.pric,
+                  order_id:item.order_id,
+                  name:item.patient.name,
+                  id_card_no:item.patient.id_card_no,
+                  insutype:item.order.insutype,
+                  settle_accounts_date:item.order.settle_accounts_date,
+                  det_item_fee_sumamt:item.det_item_fee_sumamt,
+                };
+              }
+            });
+
+            let newArr = Object.values(objInfo);
+            console.log("newAR23232323232323323",newArr.length)
+
+            if(newArr.length > 0){
+             console.log("尽力33232233232",newArr)
+              for(let i=0;i<newArr.length;i++){
+                for(let j=0;j<arr.length;j++){
+                   if(newArr[i].med_chrgitm_type == arr[j].med_chrgitm_type){
+                      newArr[i].child.push(arr[j])
+                   }
+                }
+              }
+            }
+            console.log("分类后的数据",newArr)
+            this.tableList = newArr
+            this.tableData = newArr
+          }
+          
+         }
+
+         //console.log("grouplist2323322",groupList)
+         
+       }
+     })
+    },
+    changeDate(){
+      this.start_time = this.chargeDate[0];
+      this.end_time = this.chargeDate[1];  
+      this.tableData = []
+      this.tableList = []
+      this.getHisOrderList(this.patient_id) 
+    },
+   getTime(val) {
+     if(val < 0){
+       return ""
+      }
+     if(val == ""){
+       return ""
+      }else {
+      return uParseTime(val, '{y}')
+      }
+    },
+   getTimeOne(val) {
+     if(val < 0){
+       return ""
+      }
+     if(val == ""){
+       return ""
+      }else {
+      return uParseTime(val, '{m}')
+      }
+    },
+    getCount(val){
+      var count = 0
+      for(let i=0;i<val.length;i++){
+        count +=val[i].cnt
+      }
+      if(count >0){
+        return count
+      }else{
+        return ""
+      }
+    },
+    getAllPrice(val){
+      var total_price = 0
+      for(let i=0;i<val.length;i++){
+        total_price +=val[i].cnt * val[i].pric
+      }
+      if(total_price >0){
+        return total_price.toFixed(2)
+      }else{
+        return ""
+      }
+    },
+      exportList(){
+         import('@/vendor/Export2Excel').then(excel => {
+          console.log("tabledat3323232322323wode",this.tableData)
+          for(let i=0;i<this.tableData.length;i++){
+             if(this.tableData[i].insutype == 310){
+              this.tableData[i].insutype = "职工"
+             }
+             if(this.tableData[i].insutype == 390){
+              this.tableData[i].insutype = "居民"
+             }
+             
+             this.tableData[i].year = this.getTime(this.tableData[i].settle_accounts_date)
+             this.tableData[i].month = this.getTimeOne(this.tableData[i].settle_accounts_date)
+              
+             if(this.tableData[i].med_chrgitm_type == "01"){
+               this.tableData[i].med_chrgitm_type = "床位费"
+             }
+             if(this.tableData[i].med_chrgitm_type == "02"){
+               this.tableData[i].med_chrgitm_type = "诊察费"
+             }
+             if(this.tableData[i].med_chrgitm_type == "03"){
+               this.tableData[i].med_chrgitm_type = "检查费"
+             }
+             if(this.tableData[i].med_chrgitm_type == "04"){
+               this.tableData[i].med_chrgitm_type = "化验费"
+             }
+             if(this.tableData[i].med_chrgitm_type == "05"){
+               this.tableData[i].med_chrgitm_type = "治疗费"
+             }
+             if(this.tableData[i].med_chrgitm_type == "06"){
+               this.tableData[i].med_chrgitm_type = "治疗费"
+             }
+             if(this.tableData[i].med_chrgitm_type == "08"){
+               this.tableData[i].med_chrgitm_type = "材料费"
+             }
+             if(this.tableData[i].med_chrgitm_type == "09"){
+               this.tableData[i].med_chrgitm_type = "西药费"
+             }
+             if(this.tableData[i].med_chrgitm_type == "11"){
+               this.tableData[i].med_chrgitm_type = "中成费"
+             }
+             if(this.tableData[i].med_chrgitm_type == "14"){
+               this.tableData[i].med_chrgitm_type = "其他费"
+             }
+             
+             this.tableData[i].sum_count = this.getCount(this.tableData[i].child)
+
+             this.tableData[i].find_price = this.getAllPrice(this.tableData[i].child)
+          }
+         const tHeader = ['姓名','身份证','医保类型','年','月','收费项目','数量','金额']
+         const filterVal = ['name', 'id_card_no','insutype','year','month','med_chrgitm_type','sum_count','find_price']
+
+         const data = this.formatJson(filterVal,this.tableData)
+
+         excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '药品信息'
+         })
+          this.downloadLoading = false
+
+        })
+       },
+       formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => v[j]))
+       },
+  },
+  created() {
+
+    let type = this.$store.getters.pagedata.pagestate
+    if(type == ""){
+      this.titleType = "明细"
+    }else{
+      this.titleType = type
+    }
+    const tableHeight = document.body.clientHeight - 290;
+    this.tableHeight = tableHeight;
+    this.start_time = moment(new Date()).add("year", 0).format("YYYY-MM-DD")
+    this.end_time = moment(new Date()).add("year", 0).format("YYYY-MM-DD")
+    this.getPatientList();
+    
+  },
+
+  mounted() {}
+};
+</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/outpatientTool/exportOne.vue

@@ -0,0 +1,713 @@
+<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="mainLeft">
+        <div>
+          <div
+            style="
+              margin: 10px 0;
+              display: flex;
+              justify-content: space-between;
+            "
+          >
+            <el-input
+              size="small"
+              style="width: 130px"
+              v-model="keywords"
+              class="filter-item"
+              placeholder="请输入患者名称"
+            />
+            <el-button
+              size="small"
+              class="filter-item"
+              type="primary"
+              @click="searchAction"
+              >搜索
+            </el-button>
+          </div>
+
+          <el-table
+            :row-class-name="tableRowClassName"
+            @row-click="onRowClick"
+            :data="patientTableData"
+            :height="tableHeight"
+            border
+            style="width: 100%"
+            :row-style="{ color: '#303133' }"
+            :header-cell-style="{
+              backgroundColor: 'rgb(245, 247, 250)',
+              color: '#606266',
+            }"
+            highlight-current-row
+            ref="singleTable"
+            @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>
+        </div>
+      </div>
+      <div class="mainRight">
+        <el-date-picker
+          v-model="chargeDate"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          range-separator="至"
+          start-placeholder="开始日期"
+          @change="changeDate"
+          end-placeholder="结束日期"
+        >
+        </el-date-picker>
+         <el-button  size="small" type="primary" @click="exportList" style="width:50px">导出</el-button>
+        <el-table
+        :data="tableList"
+         border
+        style="width: 100%">
+         <el-table-column prop="date" label="姓名"  width="100" align="center">
+           <template slot-scope="scope" >
+            {{ scope.row.patient.name }}
+           </template>
+        </el-table-column>
+        <el-table-column  prop="date"  label="身份证"  width="200" align="center">
+           <template slot-scope="scope" >
+            {{ scope.row.patient.id_card_no }}
+           </template> 
+        </el-table-column>
+        <el-table-column prop="name"  label="医保类型" width="100" align="center">
+          <template slot-scope="scope" >
+            <span v-if="scope.row.order.insutype == 0">居民</span>
+            <span v-if="scope.row.order.insutype == 310">职工</span>
+            <span v-if="scope.row.order.insutype == 390">居民</span>
+           </template>  
+        </el-table-column>
+        <el-table-column  prop="address" label="年"  width="50" align="center">
+          <template slot-scope="scope" >
+            {{getTime(scope.row.order.settle_accounts_date)}}
+         </template>  
+        </el-table-column>
+         <el-table-column prop="address" label="月"  width="50"  align="center">
+          <template slot-scope="scope">
+            {{getTimeOne(scope.row.order.settle_accounts_date)}}
+           </template>  
+        </el-table-column>
+         <el-table-column prop="address" label="药品编码"  width="100" align="center">
+           <template slot-scope="scope" >
+             <span v-if="scope.row.his_doctor_advice.id > 0">
+               {{scope.row.his_doctor_advice.id}}
+             </span>
+             <span v-if="scope.row.his_prescription_project.id > 0">
+               {{scope.row.his_prescription_project.id}}
+             </span>
+           </template>  
+        </el-table-column>
+         <el-table-column prop="address" label="名称"  width="100" align="center">
+           <template slot-scope="scope" >
+             <span v-if="scope.row.his_doctor_advice.id > 0">
+               {{scope.row.his_doctor_advice.advice_name}}
+             </span>
+             <span v-if="scope.row.his_prescription_project.id > 0">
+               {{scope.row.his_prescription_project.good_info.good_name}}
+             </span>
+           </template>  
+          </el-table-column>
+       
+         <el-table-column  prop="address"  label="单位"  width="130" align="center">
+         <template slot-scope="scope" >
+          
+             <span v-if="scope.row.his_doctor_advice.id > 0">
+               {{scope.row.his_doctor_advice.prescribing_number_unit}}
+             </span>
+             <span v-if="scope.row.his_prescription_project.id > 0">
+               {{scope.row.his_prescription_project.unit}}
+             </span>
+           </template>  
+        </el-table-column>
+        <el-table-column  prop="address"  label="数量"  width="130" align="center">
+         <template slot-scope="scope" >
+               {{scope.row.cnt}}
+           </template>  
+        </el-table-column>
+       <el-table-column  prop="address"  label="金额"  width="130" align="center">
+         <template slot-scope="scope" >   
+               {{(scope.row.cnt * scope.row.pric).toFixed(2)}}
+           </template>  
+        </el-table-column>
+         </el-table>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { GetDetailPatients,getHisAdviceOrderList } from "@/api/his/his_tools";
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
+const moment = require("moment");
+import { uParseTime } from '@/utils/tools'
+export default {
+  components: {
+    BreadCrumb,
+  },
+  data() {
+    return {
+      currentRowIndex: 0,
+      patientTableData: [],
+      tableHeight: 400,
+      crumbs: [
+        { path: false, name: "His工具" },
+        { path: false, name: "明细汇总统计" },
+      ],
+      titleType: "明细",
+      patient_id: 0,
+      keywords: "",
+      tableList:[],
+      tableData:[],
+      chargeDate: [
+        moment(new Date()).add("year", 0).format("YYYY-MM-DD"),
+        moment(new Date()).add("year", 0).format("YYYY-MM-DD"),
+      ],
+      start_time:"",
+      end_time:"",
+      drugList:[],
+      goodList:[],
+    };
+  },
+
+  // beforeRouteEnter(to, from, next){
+  //     if(from.path == '/hisTool/detailPrint'){
+  //       next((vm) => {
+  //         vm.titleType = "明细"
+  //       })
+  //     }else if(from.path == '/hisTool/gatherPrint'){
+  //       vm.titleType = "汇总"
+  //       next((vm) => {
+  //         vm.titleType = "汇总"
+  //       })
+  //     }else{
+  //       next()
+  //     }
+  // },
+
+  //判断列表页是否刷新
+  beforeRouteLeave(to, from, next) {
+    console.log(to, "beforeRouteEnter");
+    if (to.path != "/hisTool/detailPrint"&&to.path != "/hisTool/gatherPrint") {
+      this.$store.getters.pagedata.list.table_id = 0
+      next()
+    } else {
+     next()
+    }
+  },
+
+  watch:{
+    'titleType':{
+      handler(val){
+        this.$store.commit('SET_PAGENAME',val)
+      }
+    }
+  },
+
+  methods: {
+    getPatientList() {
+      var params = {
+        keyword: this.keywords,
+      };
+      GetDetailPatients(params).then((response) => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.patientTableData = response.data.data.patient;
+          this.patient_id = this.patientTableData[0].id;
+          if (this.$store.getters.pagedata.list.table_id == 0) {
+            this.$refs.singleTable.setCurrentRow(this.patientTableData[0]);
+          } else {
+            this.$refs.singleTable.setCurrentRow(
+              this.patientTableData[
+                this.$store.getters.pagedata.list.table_id
+              ]
+            );
+          }
+        }
+      });
+    },
+
+    tableRowClassName({ row, rowIndex }) {
+      row.row_index = rowIndex;
+    },
+
+    onRowClick(row, event, column) {
+      this.currentRowIndex = row.row_index;
+      this.$store.commit("SET_PAGEDATA", {
+        table_id: this.currentRowIndex,
+      });
+      // console.log(this.$store.getters.pagedata.list.table_id, "列表行id");
+    },
+    searchAction() {
+      this.getPatientList();
+    },
+    handleCurrentChange(row) {
+      this.patient_id = row.id;
+      this.tableList = []
+      this.tableData = []
+      this.getHisAdviceOrderList(row.id)
+    },
+    getHisAdviceOrderList(id){
+       var params = {
+        patient_id:id,
+        start_time:this.start_time,
+        end_time:this.end_time,
+       } 
+     getHisAdviceOrderList(params).then(response=>{
+        if(response.data.state == 1){
+          var arr= []
+           var list =  response.data.data.list
+           console.log("list2323322323我的",list)
+           for(let i=0;i<list.length;i++){
+             if(list[i].order.order_status  == 2){
+               arr.push(list[i])
+             }
+           }
+           this.tableList = arr
+           this.tableData = arr
+         
+        }
+     })
+    },
+    changeDate(){
+      this.start_time = this.chargeDate[0];
+      this.end_time = this.chargeDate[1];  
+      this.tableData = []
+      this.tableList = []
+      this.getHisAdviceOrderList(this.patient_id) 
+    },
+   getTime(val) {
+     if(val < 0){
+       return ""
+      }
+     if(val == ""){
+       return ""
+      }else {
+      return uParseTime(val, '{y}')
+      }
+    },
+   getTimeOne(val) {
+     if(val < 0){
+       return ""
+      }
+     if(val == ""){
+       return ""
+      }else {
+      return uParseTime(val, '{m}')
+      }
+    },
+    getCount(val){
+      var count = 0
+      for(let i=0;i<val.length;i++){
+        count +=val[i].cnt
+      }
+      if(count >0){
+        return count
+      }else{
+        return ""
+      }
+    },
+    getAllPrice(val){
+      var total_price = 0
+      for(let i=0;i<val.length;i++){
+        total_price +=val[i].cnt * val[i].pric
+      }
+      if(total_price >0){
+        return total_price.toFixed(2)
+      }else{
+        return ""
+      }
+    },
+    exportList(){
+      import('@/vendor/Export2Excel').then(excel => {
+      for(let i=0;i<this.tableData.length;i++){
+          if(this.tableData[i].insutype == 310){
+          this.tableData[i].insutype = "职工"
+          }
+          if(this.tableData[i].insutype == 390){
+          this.tableData[i].insutype = "居民"
+          }
+          
+          this.tableData[i].year = this.getTime(this.tableData[i].settle_accounts_date)
+          this.tableData[i].month = this.getTimeOne(this.tableData[i].settle_accounts_date)
+          
+          if(this.tableData[i].med_chrgitm_type == "01"){
+            this.tableData[i].med_chrgitm_type = "床位费"
+          }
+          if(this.tableData[i].med_chrgitm_type == "02"){
+            this.tableData[i].med_chrgitm_type = "诊察费"
+          }
+          if(this.tableData[i].med_chrgitm_type == "03"){
+            this.tableData[i].med_chrgitm_type = "检查费"
+          }
+          if(this.tableData[i].med_chrgitm_type == "04"){
+            this.tableData[i].med_chrgitm_type = "化验费"
+          }
+          if(this.tableData[i].med_chrgitm_type == "05"){
+            this.tableData[i].med_chrgitm_type = "治疗费"
+          }
+          if(this.tableData[i].med_chrgitm_type == "06"){
+            this.tableData[i].med_chrgitm_type = "治疗费"
+          }
+          if(this.tableData[i].med_chrgitm_type == "08"){
+            this.tableData[i].med_chrgitm_type = "材料费"
+          }
+          if(this.tableData[i].med_chrgitm_type == "09"){
+            this.tableData[i].med_chrgitm_type = "西药费"
+          }
+          if(this.tableData[i].med_chrgitm_type == "11"){
+            this.tableData[i].med_chrgitm_type = "中成费"
+          }
+          if(this.tableData[i].med_chrgitm_type == "14"){
+            this.tableData[i].med_chrgitm_type = "其他费"
+          }
+
+        this.tableData[i].name = this.tableData[i].patient.name
+        this.tableData[i].id_card_no = this.tableData[i].patient.id_card_no 
+        this.tableData[i].total_price = (this.tableData[i].cnt * this.tableData[i].pric).toFixed(2)
+        if(this.tableData[i].his_doctor_advice.id > 0){
+          this.tableData[i].his_advice_name = this.tableData[i].his_doctor_advice.advice_name
+          this.tableData[i].his_prescribing_number_unit = this.tableData[i].his_doctor_advice.prescribing_number_unit
+        }
+        if(this.tableData[i].his_prescription_project.id > 0){
+          this.tableData[i].his_advice_name = this.tableData[i].his_prescription_project.good_info.good_name
+          this.tableData[i].his_prescribing_number_unit = this.tableData[i].his_prescription_project.unit
+        }
+        if(this.tableData[i].order.insutype == 0){
+           this.tableData[i].insutype = "居民"
+        }
+        if(this.tableData[i].order.insutype == 310){
+          this.tableData[i].insutype = "职工"
+        }
+        if(this.tableData[i].order.insutype == 390){
+          this.tableData[i].insutype = "居民"
+        }
+        
+        this.tableData[i].year = this.getTime(this.tableData[i].order.settle_accounts_date)
+        this.tableData[i].month = this.getTimeOne(this.tableData[i].order.settle_accounts_date)
+      }
+      const tHeader = ['姓名','身份证','医保类型','年','月','名称','单位','数量','金额']
+      const filterVal = ['name', 'id_card_no','insutype','year','month','his_advice_name','his_prescribing_number_unit','cnt','total_price']
+
+      const data = this.formatJson(filterVal,this.tableData)
+
+      excel.export_json_to_excel({
+        header: tHeader,
+        data,
+        filename: '药品信息'
+      })
+      this.downloadLoading = false
+
+    })
+   },
+   formatJson(filterVal, jsonData) {
+     return jsonData.map(v => filterVal.map(j => v[j]))
+    },
+    getDrugNumber(drug_id){
+      
+      var id = ""
+      for(let i=0;i<this.drugList.length;i++){
+        if(this.drugList[i].id == drug_id){
+          id = this.drugList[i].id
+        }
+      }
+      return id
+    },
+    getGoodNumber(good_id){
+      var good_name = ""
+      for(let i=0;i<this.goodList.length;i++){
+        if(this.goodList[i].id == good_id){
+           good_name = this.goodList[i].good_name
+        }
+      }
+      return good_name
+    }
+  },
+  created() {
+
+    let type = this.$store.getters.pagedata.pagestate
+    if(type == ""){
+      this.titleType = "明细"
+    }else{
+      this.titleType = type
+    }
+    const tableHeight = document.body.clientHeight - 290;
+    this.tableHeight = tableHeight;
+    this.start_time = moment(new Date()).add("year", 0).format("YYYY-MM-DD")
+    this.end_time = moment(new Date()).add("year", 0).format("YYYY-MM-DD")
+    this.getPatientList();
+    
+  },
+
+  mounted() {}
+};
+</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/outpatientTool/gatherPrint.vue

@@ -10,12 +10,12 @@
         </div>
         <div class="listInfo">
             <div>科别：
-              <!-- {{getDepartment(his_patient.departments)}} -->
+              <span v-if="org_id!=10215"> {{getDepartment(his_patient.departments)}}</span> 
               {{getDepartment(his_record_patient.departments)}}
             </div>
             <div>床号：<span v-if="schedule.length > 0">{{getBedName(schedule[0].bed_id)}}</span></div>
             <div>门诊号：
-               <!-- {{his_patient.number}} -->
+               <span v-if="org_id!=10215">{{his_patient.number}}</span> 
                {{his_record_patient.ipt_otp_no}}
             </div>
             <div>姓名：{{patient.name}}</div>
@@ -45,11 +45,16 @@
             <div>护理费：{{getNursing()}}</div>
             <div>床位费：{{getBedCostTotal()}}</div>
         </div>
-        <div class="listInfo" style="margin-bottom: 20px;">
+        <div class="listInfo" style="margin-bottom: 10px;">
             <div>麻醉费：{{getAnesthesia()}}</div>
             <div>材料费：{{getMaterialCostTotal()}}</div>
             <div>其他：{{getOtherCostTotal()}}</div>
         </div>
+        <div class="listInfo" style="margin-bottom: 20px;">
+            <div>记账支付：{{getFundPaySumamt()}}</div>
+            <div>个人账号：{{getAcctPay()}}</div>
+            <div>现金支付：{{getPsnCashPay()}}</div>
+        </div>
         <table class="listTable" border="1">
             <tr>
                 <td style="text-align:center" >序号</td>
@@ -129,7 +134,6 @@
           medicalInsuranceLevelList:[],
           schedule:[],
           bedNumber:[],
-          tableList:[],
           order_info_list:[],
           balanceAccountsType:0,
           medicalInsuranceLevelList:[],
@@ -139,6 +143,8 @@
           start_time:"",
           end_time:"",
           his_record_patient:{},
+          orderList:[],
+          org_id:0,
         }
     },
     methods:{
@@ -189,7 +195,7 @@
           this.drugTypeList =response.data.data.drugTypeList
           this.costClassifyList = response.data.data.costClassifyList 
           var list = response.data.data.list
-          
+          this.orderList = response.data.data.orderList
 
           var new_arr = []
 
@@ -1059,10 +1065,58 @@
         }
       }
       return number
+    },
+    getTotalCountPrice(){
+      var total_price = 0
+      for(let i=0;i<this.tableList.length;i++){
+         if(this.tableList[i].is_total == 2){
+           total_price += this.tableList[i].pric * this.tableList[i].count_number
+         }
+      }
+      if(total_price > 0){
+        return total_price.toFixed(2)
+      }else{
+        return ""
+      }
+    },
+    getPsnCashPay(){
+      var psn_cash_pay = 0
+      for(let i=0;i<this.orderList.length;i++){
+        psn_cash_pay += this.orderList[i].psn_cash_pay
+      }
+      if(psn_cash_pay > 0){
+         return psn_cash_pay.toFixed(2)
+      }else{
+        return 0.00
+      }
+    },
+    getAcctPay(){
+      var acct_pay = 0
+      for(let i=0;i<this.orderList.length;i++){
+         acct_pay +=this.orderList[i].acct_pay
+      }
+      if(acct_pay > 0){
+        return acct_pay.toFixed(2)
+      }else{
+        return 0.00
+      }
+    },
+    getFundPaySumamt(){
+      var fund_pay_sumamt = 0
+      for(let i=0;i<this.orderList.length;i++){
+        fund_pay_sumamt +=this.orderList[i].fund_pay_sumamt
+      }
+      if(fund_pay_sumamt >0){
+        return fund_pay_sumamt.toFixed(2)
+      }else{
+        return 0.00
+      }
     }
 
     },
     created(){
+      this.org_id = this.$store.getters.xt_user.org.id;
+     
       this.getGatherDetailList()   
     }
 

src/xt_pages/outpatientTool/gatherPrintInvoice.vue

@@ -16,7 +16,7 @@
             <tr>
                 <td>姓名：{{patient.name}}</td>
                 <td>科室：
-                    <!-- {{getDepartment(his_patient.departments)}} -->
+                    <span v-if="this.$store.getters.xt_user.org.id!=10215"> {{getDepartment(his_patient.departments)}}</span>
 
                    {{ getDepartment(his_record_patient.departments) }}
                 </td>

src/xt_pages/outpatientTool/statistics.vue

@@ -167,11 +167,10 @@ export default {
 
     onRowClick(row, event, column) {
       this.currentRowIndex = row.row_index;
-      console.log(this.currentRowIndex, "this.currentRowIndex");
       this.$store.commit("SET_PAGEDATA", {
         table_id: this.currentRowIndex,
       });
-      console.log(this.$store.getters.pagedata.list.table_id, "kk");
+      // console.log(this.$store.getters.pagedata.list.table_id, "列表行id");
     },
     searchAction() {
       this.getPatientList();

src/xt_pages/qcd/patientControlAnalysis.vue

@@ -348,6 +348,8 @@ export default {
       return new Date(time).getTime() / 1000
     },
     handleClick(patientid, inspectdate) {
+      console.log("patient_id",patientid)
+      console.log("inspectdate",inspectdate)
       // var id = 0
       // var dialysis_no = 0
       // for(let i=0;i<this.tablePatients.length;i++){
@@ -389,15 +391,15 @@ export default {
         patientid: this.patient_id,
         startime: this.listQuery.start_time,
         endtime: this.listQuery.end_time
-
       }
+      console.log("param",params)
       this.isLoadingTwo = true
       getPatientContorlAnalysis(params).then(response => {
         if (response.data.state == 1) {
           this.isLoadingTwo = false
 
           var control = response.data.data.patientcontorDetail
-          //  console.log("control",control)
+          console.log("control",control)
           let dataInfo = {}
           control.forEach((item, index) => {
             let { inspect_date } = item
@@ -475,7 +477,9 @@ export default {
               dataInfotwo[inspect_date] = {
                 inspect_date,
                 name: item.name,
-                dialysis_no: item.dialysis_no
+                dialysis_no: item.dialysis_no,
+                patient_id:item.patient_id,
+                inspect_date:item.inspect_date,
               }
             }
           })
@@ -486,6 +490,8 @@ export default {
               if (item.inspect_date == parseInt(it.name)) {
                 it.name = item.name
                 it.dialysis_no = item.dialysis_no
+                it.patient_id = item.patient_id
+                it.inspect_date = item.inspect_date
               }
             })
           })
@@ -510,7 +516,7 @@ export default {
           //     }
           //   }
           // }
-
+        
         } else {
           this.isLoadingTwo = false
 
@@ -523,7 +529,7 @@ export default {
         if (response.data.state == 1) {
           this.isLoadingTwo = false
           var patients = response.data.data.patients
-          console.log('patients', patients)
+        
           this.tablePatients = patients
 
           //  let dataInfothree = {}
@@ -544,13 +550,13 @@ export default {
           var total = response.data.data.total
           this.total = total
           var control = response.data.data.control
-          console.log('control', control)
+
           var infectiousControl = response.data.data.infectiousControl
-          // console.log("infectiouscontrol",infectiousControl)
+         
           infectiousControl.map(item => {
             control.push(item)
           })
-          console.log('infectiouscontrol', infectiousControl)
+
 
           //  var newPatinteArr = []
           //  patientlist.map(item=>{

src/xt_pages/stock/detail/print.vue

@@ -10,7 +10,7 @@
         <div class="dialysis-print-order">
           <div class="order-yy-name">{{orgname}}</div>
           <div class="order-title" v-if="type == 1">入库单</div>
-        
+
           <div class="order-title" v-if="type == 2">出库单</div>
           <div class="order-title" v-if="type == 4">退库单</div>
 
@@ -27,11 +27,11 @@
               <td style="line-height: 50px" width="200">规格型号</td>
               <td style="line-height: 50px" width="80">数量</td>
               <td style="line-height: 50px" width="50">单位</td>
-            
+
               <td style="line-height:50px" width="80">
-                <span v-if="type == 1">进货价</span> 
-                <span v-if="type == 2">出货价</span> 
-                <span v-if="type == 4">退库价</span> 
+                <span v-if="type == 1">进货价</span>
+                <span v-if="type == 2">出货价</span>
+                <span v-if="type == 4">退库价</span>
               </td>
               <td style="line-height: 50px" width="80">总价</td>
               <td style="line-height: 50px" width="80">备 注</td>
@@ -47,16 +47,16 @@
               <td style="line-height: 50px">
                 {{item.specification_name}}
               </td>
-             
+
               <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-if="org_id == 10265 || org_id == 10215">{{getMySelfCount(item.good_id) }}</span>   
-                   <span v-if="org_id == 10210">{{getWarehouseOut(item.good_id)}}</span>
-                  <span v-if="org_id!=3907&&org_id!=10265&&org_id!=10285&&org_id!=9583&&org_id!=10215&&org_id!=10210">{{getStockCount(item.good_id) }}</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-if="org_id == 10265 || org_id == 10215">{{getMySelfCount(item.good_id) }}</span>
+                   <span v-if="org_id == 10210 || org_id == 9671 || org_id == 10188 || org_id == 10217 || org_id == 9956 || org_id == 10191">{{getWarehouseOut(item.good_id)}}</span>
+                  <span v-if="org_id!=3907&&org_id!=10265&&org_id!=10285&&org_id!=9583&&org_id!=10215&&org_id!=10210&&org_id!=9671 && org_id!=10188&& org_id!=10217&& org_id!=9956&& org_id!=10191">{{getStockCount(item.good_id) }}</span>
                 </span>
-               
+
                 <span v-if="type == 4"> {{ item.count }}</span>
               </td>
               <td style="line-height: 50px">
@@ -64,11 +64,11 @@
               </td>
               <td style="line-height:50px">
                 <span v-if="type == 1"> {{ item.price }}</span>
-                <span v-if="type == 2"> 
-                  <span v-if="org_id == 9919">{{ item.buy_price }}</span>  
+                <span v-if="type == 2">
+                  <span v-if="org_id == 9919">{{ item.buy_price }}</span>
                   <span v-else>
-                    {{ item.packing_price }} 
-                  </span>  
+                    {{ item.packing_price }}
+                  </span>
                 </span>
                  <span v-if="type == 4"> {{ item.price }}</span>
               </td>
@@ -78,8 +78,9 @@
                   <span v-if="org_id == 3907 || org_id ==9919">
                      {{(getStockCount(item.good_id) * item.buy_price).toFixed(2)}}
                   </span>
-                  <span v-if="org_id == 10265 || org_id == 10215">{{(getMySelfCount(item.good_id)*item.packing_price).toFixed(2)}}</span>
-                  <span v-if="org_id!=3907&&org_id!=10265&&org_id!=9919&&org_id!=10215">{{(getStockCount(item.good_id) * item.packing_price).toFixed(2)}}</span>
+                  <span v-if="org_id == 10265 || org_id == 10215  ">{{(getMySelfCount(item.good_id)*item.packing_price).toFixed(2)}}</span>
+                   <span v-if="org_id == 10210 || org_id == 9671 || org_id == 10188 || org_id == 10217 || org_id == 9956 || org_id == 10191">{{(getWarehouseOut(item.good_id)*item.packing_price).toFixed(2)}}</span>
+                  <span v-if="org_id!=3907&&org_id!=10265&&org_id!=9919&&org_id!=10215&&org_id!=9671 && org_id!=10188 && org_id!=10217 && org_id!= 9956 && org_id!=10191">{{(getStockCount(item.good_id) * item.packing_price).toFixed(2)}}</span>
                 </span>
                 <span v-if="type == 4">{{(item.count * item.price).toFixed(2)}}</span>
               </td>
@@ -98,19 +99,19 @@
               <td style="line-height: 50px"  width="50"></td>
               <td style="line-height: 50px"   width="80"></td>
               <td style="line-height: 50px"  width="80">
-                <span v-if="type == 1">{{getWareInfoTotal().toFixed(2)}}</span> 
+                <span v-if="type == 1">{{getWareInfoTotal().toFixed(2)}}</span>
                 <span v-if="type == 2">
                   <span v-if="org_id == 3907 || org_id == 9919">{{getWareOutTotalOne().toFixed(2)}}</span>
                   <span v-if="org_id == 10265 || org_id == 10215">{{getWareOutTotalSix().toFixed(2)}}</span>
                   <span v-if="org_id!=3907 && org_id!=9919 && org_id!=10265 && org_id!=10215"> {{getWareOutTotal().toFixed(2)}}</span>
-                 </span> 
-                <span v-if="type == 4">{{getWareOutTotal().toFixed(2)}}</span> 
+                 </span>
+                <span v-if="type == 4">{{getWareOutTotal().toFixed(2)}}</span>
               </td>
               <td style="line-height: 50px" width="80">
-               
+
               </td>
             </tr>
-          </table> 
+          </table>
 
           <div style="display:flex;margin-top:20px;float:right;">
             <div style="width:50px;">审批：</div><div style="width:100px;"></div>
@@ -208,7 +209,7 @@
         })
       },
       calCount(stock) {
-      
+
         let total = 0
         var array = []
         if (this.type == 1) {
@@ -308,7 +309,7 @@
       },
 
      getStockCount(id){
-       
+
        var count = ""
        for(let i=0;i<this.stockTotal.length;i++){
           if(id == this.stockTotal[i].good_id){
@@ -331,19 +332,19 @@
        for(let i=0;i<this.informationList.length;i++){
         for(let j=0;j<this.wareOutInfo.length;j++){
            if(this.informationList[i].id == this.wareOutInfo[j].good_id){
-             this.wareOutInfo[j].buy_price =  this.informationList[i].buy_price 
+             this.wareOutInfo[j].buy_price =  this.informationList[i].buy_price
            }
         }
        }
-      
+
        for(let j=0;j<this.wareOutInfo.length;j++){
          if(id == this.wareOutInfo[j].good_id){
             sum += (this.wareOutInfo[j].buy_price * this.wareOutInfo[j].count).toFixed(2)
          }
        }
-       
+
        return sum
-       
+
      },
      getReailPrice(id){
        var price = 0
@@ -381,8 +382,8 @@
            this.stockDatas = list
            var stockTotal = response.data.data.stockTotal
           this.stockTotal = stockTotal
-           
-           
+
+
          }
       })
      },
@@ -392,7 +393,7 @@
         if(response.data.state == 1){
           var total =   response.data.data.total
           var list = response.data.data.list
-          this.stockDatas = list
+          this.wareOutList = list
         }
       })
      },
@@ -433,14 +434,34 @@
        }
        return total
      },
+    //  getPrintStockGood(){
+
+    //   getPrintStockGood(this.queryParams).then(response=>{
+    //       if(response.data.state == 1){
+    //         var list =  response.data.data.list
+    //         console.log("list23323232323232",list)
+    //         this.stockDatas = list
+
+    //       }
+    //   })
+    // },
+    getWarehouseOut(good_id){
+      var total = 0
+      for(let i=0;i<this.wareOutList.length;i++){
+         if(this.wareOutList[i].good_id == good_id){
+            total += this.wareOutList[i].count
+         }
+      }
+      return total
+    }
      getPrintStockGood(){
-     
+
       getPrintStockGood(this.queryParams).then(response=>{
           if(response.data.state == 1){
             var list =  response.data.data.list
             console.log("list23323232323232",list)
             this.wareOutList = list
-           
+
           }
       })
     },
@@ -459,6 +480,7 @@
       this.orgname = xtuser.org.org_name
       this.goodUnit = this.$store.getters.good_unit
       this.getGoodDetailPrintList()
+      this.getStockDetail()
       this.getPrintStockGood()
     }
 

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -165,7 +165,7 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[10, 50, 100,1000,1500]"
+        :page-sizes="[10, 50, 100,1000,1500,3000]"
         :page-size="10"
         background
         style="margin-top:20px;float: right"
@@ -265,6 +265,7 @@ export default {
       tableDataList:[],
       storehouse_id:0,
       houseList:[],
+      wareOutList:[],
     };
   },
   methods: {
@@ -391,6 +392,7 @@ export default {
           for(let i=0;i<response.data.data.houseList.length;i++){
            this.houseList.push(response.data.data.houseList[i])
           }
+          this.wareOutList =  response.data.data.list
           var total = 0
           for (let i = 0; i < response.data.data.list.length; i++) {
             this.tableData.push(response.data.data.list[i])
@@ -778,15 +780,31 @@ export default {
           this.tableOut[i].total_price = (this.getMySelfCount(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
         }else if(this.orgId == 10215){
           this.tableOut[i].total_price = (this.getMySelfCount(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
+        }else if(this.orgId == 10210){
+          this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
+        }else if(this.orgId == 9671){
+          this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
+        }else if(this.orgId == 9956){
+          this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
+        }else if(this.orgId == 10217){
+          this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
+        }else if(this.orgId == 10191){
+          this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
+        }else if(this.orgId == 10188){
+          this.tableOut[i].total_price = (this.getWarehouseOut(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)
         }
 
-        if(this.orgId  == 10265 || this.orgId ==10215 ){
+        if(this.orgId  == 10265 || this.orgId ==10215){
 
          this.tableOut[i].out_count = this.getMySelfCount(this.tableOut[i].good_id)
         }
-        if(this.orgId!=10265 && this.orgId !=10215){
+        if(this.orgId == 10210 || this.orgId == 9671 || this.orgId == 10210 || this.orgId == 9956 || this.orgId == 10217 || this.orgId == 10188 || this.orgId == 10191){
+          this.tableOut[i].out_count = this.getWarehouseOut(this.tableOut[i].good_id)
+          console.log("out_count232233232332",this.tableOut[i].out_count)
+        }
+        if(this.orgId!=10265 && this.orgId !=10215 && this.orgId!=10210&&this.orgId!=9671 && this.orgId!=9956&& this.orgId!=10217 && this.orgId!=10188 && this.orgId!=10191){
           this.tableOut[i].out_count = this.getStockCount(this.tableOut[i].good_id)
         }
        }
@@ -821,12 +839,12 @@ export default {
           if(this.orgId == 9919){
              this.tableDataList[i].total_price = (this.tableDataList[i].count * this.tableDataList[i].GoodInfo.buy_price).toFixed(2)
              total += this.tableDataList[i].count * this.tableDataList[i].buy_price
-          }else{
+          }
+          if(this.orgId != 9919){
             this.tableDataList[i].total_price = (this.tableDataList[i].count * this.tableDataList[i].price).toFixed(2)
             total += this.tableDataList[i].count * this.tableDataList[i].price
           }
 
-
         }
         obj.total_price = total.toFixed(2)
 
@@ -926,7 +944,16 @@ export default {
      changeHouseList(){
        this.houseList = []
        this.GetCancelStock()
-     }
+     },
+     getWarehouseOut(good_id){
+      var total = 0
+      for(let i=0;i<this.wareOutList.length;i++){
+         if(this.wareOutList[i].good_id == good_id){
+            total += this.wareOutList[i].count
+         }
+      }
+      return total
+    }
   }
 };
 </script>

src/xt_pages/stock/drugs/cancelDrugOrderPrint.vue

@@ -65,7 +65,7 @@
           </div>
           <div v-if="orgId == 10024" style="display:flex;margin-top:1px;float:right;">
             <div style="width:50px;">科室：</div><div style="width:60px;"></div>
-            <div style="width:70px;">领料人：</div><div style="width:60px;"></div>
+            <div style="width:70px;">领药人：</div><div style="width:60px;"></div>
             <div style="width:80px;">审批：</div><div style="width:100px;">肖庆娥</div>
             <div style="width:50px;">会计：</div><div style="width:100px;">徐立琼</div>
             <div style="width:50px;">审核：</div><div style="width:100px;">徐立琼</div>

src/xt_pages/stock/drugs/components/drugOutDetail.vue

@@ -428,9 +428,9 @@ export default {
                order[i].total_price = order[i].count * order[i].last_price
                total_price += order[i].count * order[i].last_price
              }else{
-              
+
                if(order[i].price > 0){
-                
+
                  if(order[i].count_unit == order[i].min_unit && order[i].max_unit!=order[i].min_unit){
                    order[i].total_price = order[i].count * order[i].price
                  }
@@ -471,6 +471,8 @@ export default {
                 }
 
                  if(order[i].count_unit == order[i].max_unit && order[i].max_unit==order[i].min_unit){
+
+                if(order[i].count_unit == order[i].max_unit){
                    if(order[i].is_sys == 0){
                      order[i].total_price += order[i].count * this.getPrice(order[i].drug_id)
                    }else{
@@ -664,7 +666,10 @@ export default {
               if(this.tableData[i].count_unit == this.tableData[i].min_unit && this.tableData[i].max_unit!=this.tableData[i].min_unit){
                  this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].price)
               }
-              if(this.tableData[i].count_unit == this.tableData[i].max_unit){
+              if(this.tableData[i].count_unit == this.tableData[i].max_unit && this.tableData[i].max_unit !=this.tableData[i].min_unit){
+                this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].price)*this.tableData[i].min_number
+              }
+              if(this.tableData[i].count_unit == this.tableData[i].max_unit && this.tableData[i].max_unit ==this.tableData[i].min_unit){
                 this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].price)*this.tableData[i].min_number
               }
             }

src/xt_pages/stock/drugs/drugStockInOrder.vue

@@ -77,6 +77,23 @@
             @change="endTimeChange"
           ></el-date-picker>
         </div>
+        <!-- <div style="margin-left: 10px">
+          <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>
+        </div> -->
       </div>
 
       <div class="cell clearfix">
@@ -489,6 +506,7 @@ export default {
         loading: false,
         warehouseInfoDate: [],
       },
+      check_id: 0,
 
       startTime: "",
       dialogVisible: false,
@@ -510,6 +528,29 @@ export default {
   },
 
   methods: {
+    changeTypeName() {
+      this.getlist();
+    },
+    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,
+      };
+      getAllSecondOrderList(params).then((response) => {
+        if (response.data.state == 1) {
+          var list = response.data.data.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;
+        }
+      });
+    },
     search: function () {
       const Params = {
         page: this.page,

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -211,6 +211,7 @@
                     filterable
                     placeholder="请选择单位"
                     style="width: 80px"
+                    @change="changeUnit(scope.row,scope.$index)"
                   >
                     <el-option
                       v-for="(option, index) in unitList"
@@ -267,9 +268,7 @@
 
           <el-table-column label="总价(元)" align="center" width="80">
             <template slot-scope="scope">
-              {{
-                calculate(scope.row.last_price * scope.row.warehousing_count)
-              }}
+              {{ calculate(scope.row.last_price * scope.row.warehousing_count) }}
             </template>
           </el-table-column>
 
@@ -704,6 +703,8 @@ export default {
       tempObj["dose_unit"] = "";
       tempObj["dealer"] = "";
       tempObj["last_price"] = "";
+      tempObj["count_unit"] = "";
+      tempObj["min_number"] = "";
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function (index, row) {
@@ -832,7 +833,7 @@ export default {
             this.$message.success("请添加入库商品");
             return;
           }
-        
+
           for (let i = 0; i < this.recordInfo.recordData.length; i++) {
             if (this.recordInfo.recordData[i].dealer == "") {
               this.recordInfo.recordData[i].dealer = 0;
@@ -1029,6 +1030,8 @@ export default {
           this.recordInfo.recordData[i].number = val.number;
           this.recordInfo.recordData[i].max_unit = val.max_unit;
           this.recordInfo.recordData[i].min_unit = val.min_unit;
+          this.recordInfo.recordData[i].count_unit = val.max_unit;
+          this.recordInfo.recordData[i].min_number = val.min_number
           if (val.dealer == 0) {
             this.recordInfo.recordData[i].dealer = "";
           } else {
@@ -1084,6 +1087,19 @@ export default {
          }
       })
     }
+    changeUnit(val,index){
+    // console.log("val3232323232",val)
+    //  for(let i=0;i<this.recordInfo.recordData.length;i++){
+    //    if(i == index){
+    //      if(this.recordInfo.recordData[i].max_unit == this.recordInfo.recordData[i].count_unit){
+
+    //      }
+    //      if(this.recordInfo.recordData[i].min_unit == this.recordInfo.recordData[i].count_unit){
+
+    //      }
+    //    }
+    //  }
+    }
   },
   created() {
     if (this.$route.path == "/Pharmacy/in/add") {
@@ -1111,7 +1127,8 @@ export default {
     tempObj["drug_name"] = "";
     tempObj["dosage"] = "";
     tempObj["max_unit"] = "";
-    (tempObj["min_unit"] = ""), (tempObj["lot_number"] = "");
+    tempObj["min_unit"] = "",
+    tempObj["lot_number"] = "";
     tempObj["product_date"] = "";
     tempObj["expiry_date"] = "";
     tempObj["warehousing_count"] = "";
@@ -1124,6 +1141,8 @@ export default {
     tempObj["drug_type"] = "";
     tempObj["dealer"] = "";
     tempObj["number"] = "";
+    tempObj["count_unit"] = "";
+    tempObj["min_number"] = "";
     this.recordInfo.recordData.push(tempObj);
 
     this.GetConfigInfo();

src/xt_pages/stock/drugs/drugStockInOrderDetailPrint.vue

@@ -38,7 +38,7 @@
               <td style="line-height: 18px">
                  <span v-if="item.drug_id != 0">{{item.drug_name}}</span>
               </td>
-              <td style="line-height: 18px">{{ item.batch_number }}</td>
+              <td style="line-height: 18px">{{ item.number }}</td>
               <td style="line-height: 18px">
                  <span v-if="item.drug_id != 0">{{item.dose}}{{item.dose_unit}}*{{item.min_number}}{{item.min_unit}}/{{item.max_unit}}</span>
               </td>
@@ -51,7 +51,7 @@
                    <span>{{ item.warehousing_count }}</span>
               </td>
               <td style="line-height: 18px">
-                <span>{{item.max_unit}}</span>
+                <span>{{item.limax_unit}}</span>
               </td>
               <td style="line-height:18px">
                   <span>{{(item.warehousing_count * item.price).toFixed(2)}}</span>

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -78,6 +78,23 @@
         </div>
 
 
+         <!-- <div style="margin-left: 10px">
+          <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>
+        </div> -->
       </div>
 
       <div class="cell clearfix">
@@ -104,7 +121,7 @@
               :label="option.name"
               :value="option.id">
             </el-option>
-        </el-select> 
+        </el-select>
 
       <span>&nbsp;&nbsp;</span>
       <label class="title"><span class="name">审核状态</span> :</label>
@@ -115,7 +132,7 @@
             :label="option.name"
             :value="option.id">
           </el-option>
-      </el-select>  
+      </el-select>
       </div>
 
       <el-table
@@ -178,7 +195,7 @@
           <template slot-scope="scope">
             <span v-if="scope.row.is_check == 1">已审核</span>
             <span v-if="scope.row.is_check == 2">未审核</span>
-          
+
           </template>
         </el-table-column>
 
@@ -554,6 +571,7 @@ export default {
       ],
       page: 1,
       limit: 5,
+      check_id: 0,
       checked: false,
       total: 0,
       pageTotal: 0,
@@ -621,6 +639,30 @@ export default {
     };
   },
   methods: {
+      changeTypeName() {
+      this.getlist();
+    },
+    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,
+      };
+      getAllSecondOrderList(params).then((response) => {
+        if (response.data.state == 1) {
+          var list = response.data.data.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;
+        }
+      });
+    },
+
     search: function () {
       const Params = {
         page: this.page,
@@ -665,7 +707,7 @@ export default {
       });
       }
 
- 
+
     },
     GetWarehouseOut: function () {
       const Params = {
@@ -793,7 +835,7 @@ export default {
           row.is_sys +
           "&supply_cancel_out_id=" +
           row.supply_cancel_out_id+"&is_check="+row.is_check
-          
+
       });
     },
     handleSearch(val) {
@@ -896,7 +938,7 @@ export default {
           if(this.selectedTableData[i].supply_cancel_out_id >0){
              idsOne.push(this.selectedTableData[i].supply_cancel_out_id);
           }
-        
+
         }
       }
       if (idsOne.length > 0) {

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

@@ -593,6 +593,7 @@ export default {
       tempObj["total_count"] = 0;
       tempObj["max_unit_fisrt"] = 0;
       tempObj["min_unit_fisrt"] = 0;
+      tempObj["total_price"] = 0;
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function (index, row) {
@@ -687,60 +688,42 @@ export default {
             return;
           }
           for (let i = 0; i < this.recordInfo.recordData.length; i++) {
-            this.recordInfo.recordData[i].price =
-              this.recordInfo.recordData[i].price.toString();
+            this.recordInfo.recordData[i].total_price = (this.recordInfo.recordData[i].count * this.recordInfo.recordData[i].price).toString()
+            this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].price.toString();
 
             for (let j = 0; j < this.manufacturerList.length; j++) {
-              if (
-                this.recordInfo.recordData[i].manufacturer ==
-                this.manufacturerList[j].manufacturer_name
-              ) {
-                this.recordInfo.recordData[i].manufacturer =
-                  this.manufacturerList[j].id;
+              if (this.recordInfo.recordData[i].manufacturer ==  this.manufacturerList[j].manufacturer_name) {
+                this.recordInfo.recordData[i].manufacturer = this.manufacturerList[j].id;
               }
             }
             if (this.recordInfo.recordData[i].dealer == "") {
-              this.recordInfo.recordData[i].dealer = 0;
+                this.recordInfo.recordData[i].dealer = 0;
             }
             for (let z = 0; z < this.dealerList.length; z++) {
-              if (
-                this.recordInfo.recordData[i].dealer ==
-                this.dealerList[z].dealer_name
-              ) {
+              if (this.recordInfo.recordData[i].dealer ==this.dealerList[z].dealer_name) {
                 this.recordInfo.recordData[i].dealer = this.dealerList[z].id;
               }
             }
 
             for (let y = 0; y < this.numberList.length; y++) {
-              if (
-                this.recordInfo.recordData[i].batch_number ==
-                this.numberList[y].id
-              ) {
-                this.recordInfo.recordData[i].batch_number =
-                  this.numberList[y].batch_number;
-                this.recordInfo.recordData[i].warehouse_info_id =
-                  this.numberList[y].id;
+              if (this.recordInfo.recordData[i].batch_number ==this.numberList[y].id) {
+                this.recordInfo.recordData[i].batch_number = this.numberList[y].batch_number;
+                this.recordInfo.recordData[i].warehouse_info_id = this.numberList[y].id;
               }
             }
             for (let s = 0; s < this.doctorList.length; s++) {
-              if (
-                this.recordInfo.recordData[i].admin_user_id ==
-                this.doctorList[s].user_name
-              ) {
-                this.recordInfo.recordData[i].admin_user_id =
-                  this.doctorList[s].admin_user_id;
+              if (this.recordInfo.recordData[i].admin_user_id == this.doctorList[s].user_name) {
+                 this.recordInfo.recordData[i].admin_user_id = this.doctorList[s].admin_user_id;
               }
             }
 
-            this.recordInfo.recordData[i].last_price =
-              this.recordInfo.recordData[i].last_price.toString();
-            this.recordInfo.recordData[i].stock_count =
-              this.recordInfo.recordData[i].stock_count.toString();
+            this.recordInfo.recordData[i].last_price = this.recordInfo.recordData[i].last_price.toString();
+            this.recordInfo.recordData[i].stock_count = this.recordInfo.recordData[i].stock_count.toString();
           }
           const params = {
             stockOut: this.recordInfo.recordData,
           };
-
+          console.log("param22222222",params)
           const loading = this.$loading({
             lock: true,
             text: "Loading",
@@ -965,7 +948,6 @@ export default {
     },
     changeUnit(val, index) {
       console.log("vla33232233232323232", val);
-
       this.getDrugBatchNumber(val.drug_id);
       for (let i = 0; i < this.recordInfo.recordData.length; i++) {
         if (this.recordInfo.recordData[i].drug_id == val.drug_id) {
@@ -974,16 +956,12 @@ export default {
             this.recordInfo.recordData[i].price = val.retail_price;
           }
           if (this.recordInfo.recordData[i].max_unit == val.min_unit) {
-            this.recordInfo.recordData[i].price =
-              this.recordInfo.recordData[i].min_price;
+            this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].min_price;
           }
         }
         for (let j = 0; j < this.numberList.length; j++) {
-          if (
-            this.recordInfo.recordData[i].batch_number == this.numberList[j].id
-          ) {
-            this.recordInfo.recordData[i].batch_number =
-              this.numberList[j].batch_number;
+          if (this.recordInfo.recordData[i].batch_number == this.numberList[j].id) {
+            this.recordInfo.recordData[i].batch_number = this.numberList[j].batch_number;
           }
         }
       }
@@ -1215,6 +1193,7 @@ export default {
     tempObj["total_count"] = 0;
     tempObj["max_unit_fisrt"] = 0;
     tempObj["min_unit_fisrt"] = 0;
+    tempObj["total_price"] = 0;
     this.recordInfo.recordData.push(tempObj);
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;

src/xt_pages/stock/drugs/drugStockOutOrderDetailPrint.vue

@@ -8,6 +8,7 @@
     <div class="app-container ">
       <div id="dialysis-print-box">
         <div v-if="orgId!=9675 && orgId!=9671 && orgId!=10210">
+        <div v-if="orgId!=9671 && orgId!=10210 && orgId!=10188 && orgId!=10127 && orgId!=10164 && orgId!=3877">
         <div class="dialysis-print-order" v-for="(it,index) in tableList" :key="index">
          <div class="order-yy-name" style="font-size:22px;font-weight:bold;letter-spacing:0px;margin-top:40px">{{orgName}}</div>
           <div class="order-title" style="font-weight:500;font-size:18px;">药品出库登记表</div>
@@ -68,17 +69,17 @@
           </div>
           <div v-if="orgId == 10024" style="display:flex;margin-top:1px;float:right;">
             <div style="width:50px;">科室：</div><div style="width:60px;"></div>
-            <div style="width:70px;">领料人：</div><div style="width:60px;"></div>
+            <div style="width:70px;">领药人：</div><div style="width:60px;"></div>
             <div style="width:80px;">审批：</div><div style="width:100px;">肖庆娥</div>
             <div style="width:50px;">会计：</div><div style="width:100px;">徐立琼</div>
             <div style="width:50px;">审核：</div><div style="width:100px;">徐立琼</div>
             <div style="width:70px;">制单人：</div><div style="width:100px;">徐立琼</div>
           </div>
         </div>
-      </div> 
+      </div>
 
 
-      <div v-if="orgId == 9675 || orgId == 10210 || orgId == 9671">
+      <div v-if="orgId == 9671 || orgId == 10210 || orgId == 10188 || orgId == 10127 || orgId ==10164 || orgId ==3877">
        <div class="dialysis-print-order" v-for="(it,index) in tableData" :key="index" >
          <div class="order-yy-name" style="font-size:22px;font-weight:bold;letter-spacing:0px;margin-top:40px">{{orgName}}</div>
           <div class="order-title" style="font-weight:500;font-size:18px;">药品出库登记表</div>
@@ -105,7 +106,7 @@
                 <span>{{item.drug.drug_name}}</span>
               </td>
               <td style="line-height: 50px">
-                  <span>{{item.drug.dose}}{{item.dose_unit}}*{{item.drug.min_number}}{{item.drug.min_unit}}/{{item.drug.max_unit}}</span>
+                  <span>{{item.drug.dose}}{{item.drug.dose_unit}}*{{item.drug.min_number}}{{item.drug.min_unit}}/{{item.drug.max_unit}}</span>
               </td>
               <td style="line-height: 50px">
                   {{item.count}}
@@ -121,7 +122,7 @@
                    {{(item.count/item.min_number * item.price).toFixed(2)}}
                 </span>
                 <span v-else> {{(item.count * item.price).toFixed(2)}}</span>
-               
+
              </td>
              <td>{{item.drug_warehouse_info.batch_number}}</td>
              <td>{{(getTime(item.product_date))}}</td>
@@ -144,7 +145,7 @@
           </div>
           <div v-if="orgId == 10024" style="display:flex;margin-top:1px;float:right;">
             <div style="width:50px;">科室：</div><div style="width:60px;"></div>
-            <div style="width:70px;">领料人：</div><div style="width:60px;"></div>
+            <div style="width:70px;">领药人：</div><div style="width:60px;"></div>
             <div style="width:80px;">审批：</div><div style="width:100px;">肖庆娥</div>
             <div style="width:50px;">会计：</div><div style="width:100px;">徐立琼</div>
             <div style="width:50px;">审核：</div><div style="width:100px;">徐立琼</div>
@@ -290,7 +291,7 @@
             for (let i = 0; i < response.data.data.list.length; i++) {
               this.list.push(response.data.data.list[i])
             }
-           
+
           }
         })
       },
@@ -393,7 +394,7 @@
              var info = response.data.data.info
             var warehousing = response.data.data.warehousing
             this.warehouseList = warehousing
-          
+
             for(let i=0;i<info.length;i++){
                info[i].child = []
               for(let j=0;j<warehousing.length;j++){
@@ -402,11 +403,11 @@
                 }
               }
             }
-            
+
             var manufacturerList = response.data.data.manufacturerList
-           
+
             this.manufactureList = manufacturerList
-            
+
             this.tableList = info
             this.tableData = response.data.data.drug_warhouse_out
             console.log("nfo32323223323223232323",this.tableData)
@@ -434,7 +435,7 @@
     created() {
       this.orgName = this.$store.getters.xt_user.org.org_name;
       const order_id = this.$route.query.id;
-      this.orgId = this.$store.getters.xt_user.org.id;  
+      this.orgId = this.$store.getters.xt_user.org.id;
       this.getDrugOutOrderDetailPrint(order_id)
     }
 

src/xt_pages/stock/drugs/inventory.vue

@@ -884,7 +884,7 @@ export default {
          arr[i].last_stock_max_number = parseInt(arr[i].last_stock_max_number)
          arr[i].last_stock_min_number = parseInt(arr[i].last_stock_min_number)
 
-         
+         arr[i].storehouse_id = this.storehouse_id
        }
 
        var params = {

src/xt_pages/stock/drugs/inventoryDetails.vue

@@ -27,6 +27,7 @@
                 >
             </div>
             <div>
+               <el-button size="small" type="primary" @click="print_1">打印</el-button>
                <el-button size="small" type="primary" @click="print">盘点模版打印</el-button>
             </div>
             <!-- <div>
@@ -141,6 +142,9 @@ export default {
         print(){
             this.$router.push({path:'/stock/drugs/inventoryPrint'}) 
         },
+        print_1(){
+           this.$router.push({path:'/stock/drugs/print'}) 
+        },
         handleSizeChange(val){
          this.limit = val
          this.getlist()

src/xt_pages/stock/drugs/print.vue

@@ -0,0 +1,137 @@
+<template>
+    <div class="main-contain">
+        <div class="position">
+        <bread-crumb :crumbs="crumbs"></bread-crumb>
+        <el-row style="float:right;">
+            <el-col :span="24">
+            <el-button size="small" icon="el-icon-printer" type="primary" @click="printAction">打印</el-button>
+            </el-col>
+        </el-row>
+        </div>
+        <div class="app-container" style="background-color: white;">
+            <div id="print_content">
+
+                <table class="printTable" border="0" cellspacing="0" align="center">
+                    <thead class="print_head">
+                        <tr><td colspan="11">{{org_name}}</td></tr>
+                        <tr><td colspan="11">药品盘点</td></tr>
+                    </thead>  
+                    <tbody class="print_body">
+                    <tr>
+                        <td>药品名称</td>
+                        <td>规格</td>
+                        <td>单位</td>
+                        <td>批号</td>
+                        <td>生产厂商</td>
+                        <td>仓库名称</td>
+                        <td>盘点前数量</td> 
+                        <td>盘点后数量</td>
+                        <td>盈亏类型</td>
+                        <td>进货单价</td>
+                        <td width="60">总额</td>
+                        
+                    </tr>
+                    <tr v-for="(item,index) in tableData" :key="index">
+                        <td>{{item.good_name}}</td>
+                        <td>{{item.specification_name}}</td>
+                        <td>{{item.packing_unit}}</td>
+                        <td>{{item.number}}</td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                    </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import BreadCrumb from '@/xt_pages/components/bread-crumb'
+const moment = require('moment');
+import { uParseTime } from '@/utils/tools'
+import { getInventoryExportList } from "@/api/stock"
+import print from "print-js";
+export default {
+    components:{
+        BreadCrumb
+    },
+    data(){
+        return{
+          crumbs: [
+            { path: false, name: '库存管理' },
+            { path: false, name: '耗材管理' },
+            { path: false, name: '耗材盘点打印' },
+          ],
+          org_name:"",
+          ids:"",
+          tableData:[],
+          manufacturerList:[],
+        }
+    },
+    methods:{
+        printAction: function() {
+            const style = '@page{size:landscape;margin: 10mm;} @media print { print_content{width:960px;margin:0} .flex{display: flex;justify-content: space-between;} .printTable{width:100%;border-collapse: collapse;border:0px;margin:10px 0;} .printTable thead{text-align:center}.printTable td{padding:5px;} .print_body tr td{border: 1px solid;font-size:12px;border-collapse:collapse;} }';
+            printJS({ 
+            printable: 'print_content',
+            type: 'html',
+            documentTitle: '  ',
+            style: style,
+            scanStyles: false
+            })
+        },
+        getTime(val) {
+         if(val < 0){
+            return ""
+          }
+         if(val == ""){
+            return ""
+          }else {
+            return uParseTime(val, '{y}-{m}-{d}')
+         }
+        },
+        getlist(){
+         getInventoryExportList().then(response=>{
+           if(response.data.state == 1){
+             var list =  response.data.data.list
+             console.log("list233233232323",list)
+             this.tableData = list
+             this.manufacturerList = response.data.data.manufacturerList
+           }
+         })
+        },
+        getManufacturerName(id){
+
+           var name = ""
+           for(let i=0;i<this.manufacturerList.length;i++){
+              if(id == this.manufacturerList[i].id){
+                  name = this.manufacturerList[i].manufacturer_name
+              }
+           }
+           return name
+        }
+    },
+    created(){
+      this.getlist()
+    }
+}
+</script>
+
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.printTitle{font-size: 22px;text-align: center;}
+.flex{display: flex;justify-content: space-between;}
+.tableTitle{display: flex;border-top:1px solid #000;border-bottom: 1px solid #000;padding: 10px 0;}
+.tableTr{display: flex;border-bottom: 1px dashed #000;padding: 10px 0;}
+.tableBottom{display: flex;border-bottom: 1px solid #000;padding: 10px 0;}
+.printTable{width:100%;border-collapse: collapse;}
+.printTable td{padding:5px;}
+.print_head{border: none;display: table-header-group;}
+.print_head tr td{text-align: center;border: none;}
+.print_body tr td{border:1px solid}
+</style>

src/xt_pages/stock/inventory.vue

@@ -572,12 +572,13 @@ export default {
         }else{
           arr[i].last_stock_count = parseInt(arr[i].last_stock_count)
         }
-        
+        arr[i].storehouse_id = this.storehouse_id
       }
        var params = {
          tableData:arr,
          storehouse_id:this.storehouse_id,
        }
+      console.log("param23323232323232323",params)
       saveStockInentoryList(params).then(response=>{
         if(response.data.state == 1){
            var inventory = response.data.data.inventory

src/xt_pages/stock/inventoryDetails.vue

@@ -26,6 +26,7 @@
                 @click="search">搜索</el-button>
             </div>
             <div>
+              <el-button type="primary" @click="toprint">打印</el-button>
               <el-button type="primary" @click="inventoryExportList">盘点模版打印</el-button>
             </div>
             <!-- <div>
@@ -128,6 +129,10 @@ export default {
          }
     },
     methods:{
+        toprint(){
+          this.$router.push({path:'/stock/print_all'})
+        },
+
         search(){
          this.getlist()
         },

src/xt_pages/stock/inventoryPrint.vue

@@ -66,7 +66,7 @@ export default {
     },
     methods:{
         printAction: function() {
-            const style = '@media print { .printTitle{font-size: 22px;text-align: center;}.flex{display: flex;justify-content: space-between;}.tableTitle{display: flex;border-top:1px solid #000;border-bottom: 1px solid #000;padding: 10px 0;}.tableTr{display: flex;border-bottom: 1px dashed #000;padding: 10px 0;}.tableBottom{display: flex;border-bottom: 1px solid #000;padding: 10px 0;}.printTable td{padding:5px;} }';
+            const style = '@media print { .printTitle{font-size: 22px;text-align: center;}.flex{display: flex;justify-content: space-between;}.tableTitle{display: flex;border-top:1px solid #000;border-bottom: 1px solid #000;padding: 10px 0;}.tableTr{display: flex;border-bottom: 1px dashed #000;padding: 10px 0;}.tableBottom{display: flex;border-bottom: 1px solid #000;padding: 10px 0;}.printTable{width:100%;border-collapse: collapse;}.printTable td{padding:5px;} }';
             printJS({
             printable: 'print_content',
             type: 'html',

src/xt_pages/stock/print_all.vue

@@ -0,0 +1,136 @@
+<template>
+    <div class="main-contain">
+        <div class="position">
+        <bread-crumb :crumbs="crumbs"></bread-crumb>
+        <el-row style="float:right;">
+            <el-col :span="24">
+            <el-button size="small" icon="el-icon-printer" type="primary" @click="printAction">打印</el-button>
+            </el-col>
+        </el-row>
+        </div>
+        <div class="app-container" style="background-color: white;">
+            <div id="print_content">
+
+                <table class="printTable" border="0" cellspacing="0" align="center">
+                    <thead class="print_head">
+                        <tr><td colspan="11">{{org_name}}</td></tr>
+                        <tr><td colspan="11">耗材盘点</td></tr>
+                    </thead>
+                    <tbody class="print_body">
+                    <tr>
+                        <td>耗材名称</td>
+                        <td>规格</td>
+                        <td>单位</td>
+                        <td>批号</td>
+                        <td>生产厂商</td>
+                        <td>仓库名称</td>
+                        <td>盘点前数量</td> 
+                        <td>盘点后数量</td>
+                        <td>盈亏类型</td>
+                        <td>进货单价</td>
+                        <td width="60">总额</td>
+                        
+                    </tr>
+                    <tr v-for="(item,index) in tableData" :key="index">
+                        <td>{{item.good_name}}</td>
+                        <td>{{item.specification_name}}</td>
+                        <td>{{item.packing_unit}}</td>
+                        <td>{{item.number}}</td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                    </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import BreadCrumb from '@/xt_pages/components/bread-crumb'
+const moment = require('moment');
+import { uParseTime } from '@/utils/tools'
+import { getInventoryExportList } from "@/api/stock"
+import print from "print-js";
+export default {
+    components:{
+        BreadCrumb
+    },
+    data(){
+        return{
+          crumbs: [
+            { path: false, name: '库存管理' },
+            { path: false, name: '耗材管理' },
+            { path: false, name: '耗材盘点打印' },
+          ],
+          org_name:"",
+          ids:"",
+          tableData:[],
+          manufacturerList:[],
+        }
+    },
+    methods:{
+        printAction: function() {
+            const style = '@page{size:landscape;margin: 10mm;} @media print { print_content{width:960px;margin:0} .flex{display: flex;justify-content: space-between;} .printTable{width:100%;border-collapse: collapse;border:0px;margin:10px 0;} .printTable thead{text-align:center}.printTable td{padding:5px;} .print_body tr td{border: 1px solid;font-size:12px;border-collapse:collapse;} }';
+            printJS({ 
+            printable: 'print_content',
+            type: 'html',
+            documentTitle: '  ',
+            style: style,
+            scanStyles: false
+            })
+        },
+        getTime(val) {
+         if(val < 0){
+            return ""
+          }
+         if(val == ""){
+            return ""
+          }else {
+            return uParseTime(val, '{y}-{m}-{d}')
+         }
+        },
+        getlist(){
+        //  getInventoryExportList().then(response=>{
+        //    if(response.data.state == 1){
+        //      var list =  response.data.data.list
+        //      console.log("list233233232323",list)
+        //      this.tableData = list
+        //      this.manufacturerList = response.data.data.manufacturerList
+        //    }
+        //  })
+        },
+        getManufacturerName(id){
+           var name = ""
+           for(let i=0;i<this.manufacturerList.length;i++){
+              if(id == this.manufacturerList[i].id){
+                  name = this.manufacturerList[i].manufacturer_name
+              }
+           }
+           return name
+        }
+    },
+    created(){
+      this.getlist()
+    }
+}
+</script>
+
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.printTitle{font-size: 22px;text-align: center;}
+.flex{display: flex;justify-content: space-between;}
+.tableTitle{display: flex;border-top:1px solid #000;border-bottom: 1px solid #000;padding: 10px 0;}
+.tableTr{display: flex;border-bottom: 1px dashed #000;padding: 10px 0;}
+.tableBottom{display: flex;border-bottom: 1px solid #000;padding: 10px 0;}
+.printTable{width:100%;border-collapse: collapse;}
+.printTable td{padding:5px;}
+.print_head{border: none;display: table-header-group;}
+.print_head tr td{text-align: center;border: none;}
+.print_body tr td{border:1px solid}
+</style>

src/xt_pages/stock/stockInOrder.vue

@@ -71,6 +71,24 @@
             @change="endTimeChange"
           ></el-date-picker>
         </div>
+        <!-- <div style="margin-left: 10px">
+          <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>
+        </div> -->
+
       </div>
 
 
@@ -87,7 +105,7 @@
         <el-button size="small" type="primary" @click="toPrint">打印</el-button>
 
         <el-button size="small" type="primary" @click="toExport">导出</el-button>
-         
+
           <span>&nbsp;&nbsp;</span>
           <label class="title"><span class="name">审核状态</span> :</label>
           <el-select size="small" v-model="check_type" filterable placeholder="请选择仓库" style="width:200px" @change="changeCheckType">
@@ -97,7 +115,7 @@
                 :label="option.name"
                 :value="option.id">
               </el-option>
-          </el-select>  
+          </el-select>
       </div>
 
       <el-table
@@ -295,6 +313,11 @@
             {{ scope.row.license_number}}
           </template>
         </el-table-column>
+        <el-table-column label="注册编码" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.register_number}}
+          </template>
+        </el-table-column>
         <el-table-column label="备注" align="center">
           <template slot-scope="scope">
             {{ scope.row.remark }}
@@ -830,11 +853,35 @@ export default {
        {id:1,name:"已审核"},
        {id:2,name:"未审核"},
       ]
+      check_id: 0,
     };
 
 
   },
   methods: {
+          changeTypeName() {
+      this.getlist();
+    },
+    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,
+      };
+      getAllSecondOrderList(params).then((response) => {
+        if (response.data.state == 1) {
+          var list = response.data.data.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;
+        }
+      });
+    },
     changeCheckType(){
       this.GetWarehouse()
     },
@@ -1125,7 +1172,7 @@ export default {
       }
     },
     handleEdit: function(index, row) {
-      
+
       this.$router.push({path:"/stock/in/order/edit?id="+row.id+"&supply_warehouse_id="+row.supply_warehouse_id+"&is_sys="+row.is_sys+"&is_check="+row.is_check+"&type="+row.type})
     },
     handleDelete: function(index, row) {
@@ -1210,7 +1257,7 @@ export default {
         if(this.selectedTableData[i].supply_warehouse_id >0){
           idOne.push(this.selectedTableData[i].supply_warehouse_id)
         }
-       
+
       }
       for(let i=0;i<idOne.length;i++){
         if(idOne[i] >0){