ソースを参照

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

csx 3 年 前
コミット
ef49b0c8dc

+ 2 - 2
src/xt_pages/hospitalStation/settlementPrint.vue ファイルの表示

1
 <template>
1
 <template>
2
   <div>
2
   <div>
3
     <template>
3
     <template>
4
-      <el-button
4
+      <el-buttonc
5
         style="position:fixed;right:25px;z-index:999"
5
         style="position:fixed;right:25px;z-index:999"
6
         :loading="loading"
6
         :loading="loading"
7
         size="small"
7
         size="small"
8
         icon="el-icon-printer"
8
         icon="el-icon-printer"
9
         @click="printThisPage"
9
         @click="printThisPage"
10
         type="primary"
10
         type="primary"
11
-        >打印</el-button
11
+        >打印</el-buttonc
12
       >
12
       >
13
     </template>
13
     </template>
14
     <div class="app-container" style="padding-top:40px;">
14
     <div class="app-container" style="padding-top:40px;">

+ 1 - 1
src/xt_pages/outpatientCharges/costComparison.vue ファイルの表示

1
-<template>
1
+c<template>
2
     <div class="main-contain incomeStatistics">
2
     <div class="main-contain incomeStatistics">
3
         <div class="position">
3
         <div class="position">
4
             <bread-crumb :crumbs='crumbs'></bread-crumb>
4
             <bread-crumb :crumbs='crumbs'></bread-crumb>

+ 1 - 1
src/xt_pages/outpatientCharges/outpatientChargesManagement.vue ファイルの表示

135
                             <div style="margin-bottom:10px;float: right">
135
                             <div style="margin-bottom:10px;float: right">
136
                               <div>
136
                               <div>
137
                                 <el-button
137
                                 <el-button
138
-                                    v-if="(hisPatientInfo.id > 0 &&  items.prescriptions[0].order.id == 0)"
138
+                                    v-if="(hisPatientInfo.balance_accounts_type == 1 && hisPatientInfo.id > 0 &&  items.prescriptions[0].order.id == 0)"
139
                                     size="small"
139
                                     size="small"
140
                                     @click="open(8,items.med_type,items.prescriptions[0].order,items.prescriptions)"
140
                                     @click="open(8,items.med_type,items.prescriptions[0].order,items.prescriptions)"
141
                                     type="primary"
141
                                     type="primary"

+ 3 - 3
src/xt_pages/outpatientDoctorStation/pastInquiries.vue ファイルの表示

14
                         format="yyyy-MM-dd"
14
                         format="yyyy-MM-dd"
15
                         value-format="yyyy-MM-dd"
15
                         value-format="yyyy-MM-dd"
16
                         placeholder="选择日期时间" align="right"></el-date-picker>
16
                         placeholder="选择日期时间" align="right"></el-date-picker>
17
-<!--        <el-button size="small" style="margin:0 10px;" class="filter-item" type="primary" @click="batchPrint(1)">处方筏批量打印</el-button>-->
18
-<!--        <el-button size="small" style="margin:0 10px;" class="filter-item" type="primary" @click="batchPrint(2)">治疗单批量打印</el-button>-->
19
-<!--        <el-button size="small" style="margin:0 10px;" class="filter-item" type="primary" @click="batchPrint(3)">检验单批量打印</el-button>-->
17
+        <el-button size="small" style="margin:0 10px;" class="filter-item" type="primary" @click="batchPrint(1)">处方筏批量打印</el-button>
18
+        <el-button size="small" style="margin:0 10px;" class="filter-item" type="primary" @click="batchPrint(2)">治疗单批量打印</el-button>
19
+        <el-button size="small" style="margin:0 10px;" class="filter-item" type="primary" @click="batchPrint(3)">检验单批量打印</el-button>
20
       </div>
20
       </div>
21
       <el-table :data="tableData" border ref="table" style="width: 100%;" :row-style="{ color: '#303133' }" @selection-change="handleSelectionChange"
21
       <el-table :data="tableData" border ref="table" style="width: 100%;" :row-style="{ color: '#303133' }" @selection-change="handleSelectionChange"
22
                 :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
22
                 :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>