提交merge1.3

openhis-ui-vue3/src/views/charge/cliniccharge/index.vue

@@ -83,20 +83,6 @@
             :disabled="buttonDisabled">
             自费转医保
           </el-button>
-<<<<<<< HEAD
-          <el-button type="primary" @click="studentPayTosStudentSelf()" style="margin-left: 20px"
-            :disabled="buttonDisabled">
-            学生医保转学生自费
-          </el-button>
-          <el-button type="primary" @click="studentSelfToStudentPay()" style="margin-left: 20px"
-            :disabled="buttonDisabled">
-            学生自费转学生医保
-          </el-button>
-          <span style="float: right">合计金额：{{ totalAmounts ? totalAmounts.toFixed(2) : 0 }}元</span>
-        </div>
-        <el-table ref="chargeListRef" height="530" :data="chargeList" row-key="id"
-          @selection-change="handleSelectionChange" v-loading="chargeLoading" :span-method="objectSpanMethod" border>
-=======
           <el-button
             type="primary"
             @click="studentPayTosStudentSelf()"
@@ -127,7 +113,6 @@
           :span-method="objectSpanMethod"
           border
         >
->>>>>>> v1.3
           <el-table-column type="selection" :selectable="checkSelectable" width="55" />
           <el-table-column label="单据号" align="center" prop="busNo" width="180" />
           <el-table-column label="收费项目" align="center" prop="itemName" width="200" />
@@ -137,9 +122,6 @@
           <el-table-column label="费用性质" align="center" prop="contractName" />
           <el-table-column label="收费状态" align="center" prop="statusEnum_enumText" width="150">
             <template #default="scope">
-<<<<<<< HEAD
-              <el-tag :type="scope.row.statusEnum === 1 ? 'default' : 'success'" disable-transitions>
-=======
               <el-tag v-if="scope.row.statusEnum === 1" disable-transitions>
                 {{ scope.row.statusEnum_enumText }}
               </el-tag>
@@ -150,7 +132,6 @@
                 {{ scope.row.statusEnum_enumText }}
               </el-tag>
               <el-tag v-else type="warning" disable-transitions>
->>>>>>> v1.3
                 {{ scope.row.statusEnum_enumText }}
               </el-tag>
             </template>
@@ -161,11 +142,6 @@
             </template>
           </el-table-column>
           <el-table-column label="收款人" align="center" prop="entererId_dictText" />
-<<<<<<< HEAD
-          <el-table-column label="操作" align="center" fixed="right" header-align="center" class-name="no-hover-column">
-            <template #default="scope">
-              <el-button :disabled="!scope.row.paymentId" link type="primary" @click="printCharge(scope.row)">
-=======
           <el-table-column
             label="操作"
             align="center"
@@ -180,7 +156,6 @@
                 type="primary"
                 @click="printCharge(scope.row)"
               >
->>>>>>> v1.3
                 打印
               </el-button>
             </template>
@@ -292,10 +267,6 @@ function handleTotalAmount() {
     totalAmounts.value = chargeList.value.reduce((accumulator, currentRow) => {
       return new Decimal(accumulator).add(currentRow.totalPrice.toFixed(2) || 0);
     }, new Decimal(0));
-<<<<<<< HEAD
-
-=======
->>>>>>> v1.3
   } else {
     totalAmounts.value = selectedRows.value.reduce((accumulator, currentRow) => {
       return new Decimal(accumulator).add(currentRow.totalPrice.toFixed(2) || 0);
@@ -652,8 +623,6 @@ function objectSpanMethod({ row, column, rowIndex, columnIndex }) {
   return [1, 1];
 }
 
-<<<<<<< HEAD
-=======
 // function printCharge(row) {
 //   // 打印功能实现
 //   let rows = [];
@@ -667,7 +636,6 @@ function objectSpanMethod({ row, column, rowIndex, columnIndex }) {
 //     proxy.$refs['chargeDialogRef'].printReceipt(res.data);
 //   });
 // }
->>>>>>> v1.3
 function printCharge(row) {
   // 打印功能实现
   let rows = [];
@@ -678,9 +646,6 @@ function printCharge(row) {
   });
   chargedItems.value = rows;
   getChargeInfo({ paymentId: row.paymentId }).then((res) => {
-<<<<<<< HEAD
-    proxy.$refs['chargeDialogRef'].printReceipt(res.data);
-=======
     // 设置实收金额
     if (res.data && res.data.detail) {
       const amountDetail = res.data.detail.find((item) => item.payEnum == 220000);
@@ -712,7 +677,6 @@ function printCharge(row) {
         proxy.$refs['chargeDialogRef'].printReceipt(enhancedPrintData);
       });
     }
->>>>>>> v1.3
   });
 }
 </script>
@@ -724,8 +688,4 @@ function printCharge(row) {
 :deep(.el-table__body) tr:hover td.no-hover-column {
   background-color: inherit !important;
 }
-<<<<<<< HEAD
 </style>
-=======
-</style>
->>>>>>> v1.3