提交merge1.3

openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/index.vue

@@ -23,17 +23,11 @@
         <el-tab-pane label="在科" name="first" style="padding: 15px 10px">
           <PatientList />
         </el-tab-pane>
-<<<<<<< HEAD
-        <el-tab-pane label="转科" name="second" style="padding: 0 10px">
-          <PatientList />
-        </el-tab-pane>
-=======
         <!-- 隐藏tab 
         <el-tab-pane label="转科" name="second" style="padding: 0 10px">
           <PatientList />
         </el-tab-pane>
         -->
->>>>>>> v1.3
       </el-tabs>
     </div>
 
@@ -44,15 +38,11 @@
         <el-tab-pane label="划价确费" name="billing">
           <BillingList ref="billingRef" />
         </el-tab-pane>
-<<<<<<< HEAD
-        <el-tab-pane label="医嘱计费" name="orderBilling">
-=======
         <el-tab-pane label="费用明细查询" name="expenseDetail">
           <!-- <FeeDetailQuery :activeTab="activeTab" ref="feeDetailQueryRef" /> -->
           <NewfeeDetailQuery :activeTab="activeTab" ref="feeDetailQueryRef" />
         </el-tab-pane>
         <!--  <el-tab-pane label="医嘱计费" name="orderBilling">
->>>>>>> v1.3
           <OrderBilling ref="orderBillingRef" />
         </el-tab-pane>
         <el-tab-pane label="费用明细查询" name="expenseDetail">
@@ -61,11 +51,7 @@
         <el-tab-pane label="预交金查询" name="depositQuery">
           <deposit-query ref="depositQueryRef" />
         </el-tab-pane>
-<<<<<<< HEAD
-        <!-- <el-tab-pane label="患者流转日志" name="patientFlow">
-=======
         <el-tab-pane label="患者流转日志" name="patientFlow">
->>>>>>> v1.3
           <div style="padding: 20px; text-align: center; color: #909399">患者流转日志功能区域</div>
         </el-tab-pane> -->
       </el-tabs>
@@ -76,16 +62,10 @@
 <script setup>
 import { ref, onMounted, nextTick } from 'vue';
 import { ElMessage } from 'element-plus';
-<<<<<<< HEAD
-import PatientList from '../medicalOrderExecution/components/patientList.vue';
-import BillingList from './components/billingList.vue';
-import FeeDetailQuery from './components/feeDetailQuery.vue';
-=======
 import PatientList from '../components/patientList.vue';
 import BillingList from './components/billingList.vue';
 import FeeDetailQuery from './components/feeDetailQuery.vue';
 import NewfeeDetailQuery from './components/newfeeDetailQuery.vue';
->>>>>>> v1.3
 import DepositQuery from './components/depositQuery.vue';
 import OrderBilling from './components/OrderBilling.vue';
 
@@ -115,11 +95,7 @@ function handleTabChange() {
   // 切换到划价确费标签时，刷新数据
   if (activeTab.value === 'billing' && billingRef.value) {
     nextTick(() => {
-<<<<<<< HEAD
-      billingRef.value.handleQuery();
-=======
       // billingRef.value.handleQuery();
->>>>>>> v1.3
     });
   }
   // 切换到医嘱计费标签时，刷新数据