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

src/xt_pages/outpatientCharges/components/prescriptionTable.vue

@@ -4,27 +4,27 @@
       v-if="prescription.type == 1"
       :data="prescription.advices"
       border
+      height="370"
       style="width: 99%"
       :row-style="changColor"
       :header-cell-style="{
         color: '#606266',
       }"
       highlight-current-row
-      min-height="200px"
+      
     >
-    <!-- max-height=290px -->
       <el-table-column
         fixed
         align="center"
         type="index"
-        width="40"
+        width="50"
         label="序号"
       ></el-table-column>
       <el-table-column
         fixed
         align="center"
         prop="name"
-        width="400"
+        width="300"
         label="名称"
       >
         <template slot-scope="scope"
@@ -74,7 +74,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column align="center" prop="name" width="320" label="医保编码">
+      <el-table-column align="center" prop="name" width="220" label="医保编码">
         <template slot-scope="scope">
           <div>{{ scope.row.code }}</div>
         </template>
@@ -124,7 +124,7 @@
       <el-table-column
         align="center"
         prop="name"
-        width="90"
+        width="130"
         label="符合正常范围金额"
       >
         <template slot-scope="scope">
@@ -143,6 +143,7 @@
       v-if="prescription.type == 2"
       :data="prescription.project"
       border
+      height="370"
       style="width: 99%"
       :row-style="changColor"
       :header-cell-style="{
@@ -155,14 +156,14 @@
         fixed
         align="center"
         type="index"
-        width="40"
+        width="50"
         label="序号"
       ></el-table-column>
       <el-table-column
         fixed
         align="center"
         prop="project_name"
-        width="400"
+        width="280"
         label="名称"
       >
         <template slot-scope="scope">{{ scope.row.project_name }}</template>
@@ -170,7 +171,7 @@
       <el-table-column
         align="center"
         prop="statistical_classification"
-        width="100"
+        width="80"
         label="组"
       >
         <template slot-scope="scope">{{
@@ -224,13 +225,13 @@
         <template slot-scope="scope">{{ scope.row.price }}元</template>
       </el-table-column>
 
-      <el-table-column align="center" prop="name" width="60" label="执行状态">
+      <el-table-column align="center" prop="name" width="80" label="执行状态">
         <template slot-scope="scope">
           <div>{{ scope.row.execution_state == 1 ? "已执行" : "未执行" }}</div>
         </template>
       </el-table-column>
 
-      <el-table-column align="center" prop="name" width="120" label="医保编码">
+      <el-table-column align="center" prop="name" width="220" label="医保编码">
         <template slot-scope="scope">
           <div>{{ scope.row.medical_code }}</div>
         </template>
@@ -280,7 +281,7 @@
       <el-table-column
         align="center"
         prop="name"
-        width="90"
+        width="130"
         label="符合正常范围金额"
       >
         <template slot-scope="scope">

src/xt_pages/outpatientCharges/invoiceTemplate/printtwelve.vue

@@ -83,7 +83,6 @@
           <div :style="{position: 'absolute',top:'360px',left:(490 + (index * 200)) + 'px'}">{{Arr[0][0].printDate}}</div>
         </div>
       </div>
-
     </div>
 
   </div>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -198,14 +198,9 @@
             <el-tab-pane label="日结" name="first">
               <div style="display:flex;height:100%;">
                 <div class="centerLeft">
-                  <div>
                     <div class="tabsBox" v-for="items,index in big_prescriptions" :key="index">
-                      <div style="height: calc(100% - 60px);">
-
-
                         <el-tabs class="preTabs" v-model="editableTabsValue" type="border-card"
                                  @tab-click="tabclickEvent">
-                          <!--<el-radio-group v-model="med_radio">-->
                           <el-tab-pane
                             v-for="(item, index) in items.prescriptions"
                             :key="index"
@@ -245,25 +240,21 @@
                                   type="primary"
                                 >撤销明细
                                 </el-button>
-                                <!--<div>{{ items.curPrescriptions.order.order_status}}</div>-->
-                                <!--<div>{{ items.prescriptions[0].order.order_status}}</div>-->
                                 <el-button v-loading="loadingtwo"
                                            v-if="((hisPatientInfo.id > 0 && items.curPrescriptions.order.id == 0) || items.curPrescriptions.order.order_status == 1 ||  items.curPrescriptions.order.order_status == 3) && org_id != 10340"
                                            size="small"
                                            @click="open(4,items.med_type,items.curPrescriptions.order,items.prescriptions)"
-                                           type="primary">收费<!--修改的地方-->
+                                           type="primary">收费  
                                 </el-button>
                               </div>
                             </div>
                           </el-tab-pane>
-
-
-                          <prescription-table ref="prescription_tables"
+                            <prescription-table ref="prescription_tables"
                                               :prescription="items.curPrescriptions"
                                               :manufacturers="manufacturers"></prescription-table>
-                          <!--</el-radio-group>-->
+                          
                         </el-tabs>
-                      </div>
+
                       <div class="costBox">
                         <span>当前处方总费用：<span style="color:red;">{{ items.total }}元</span></span>
 
@@ -326,12 +317,7 @@
 
                       </div>
 
-
                     </div>
-                  </div>
-
-
-
                 </div>
                 <div class="centerRight">
                   <p class="centerRightTitle" style="padding-top: 10px;">就诊信息</p>
@@ -557,7 +543,6 @@
 
 
                   </div>
-
                 </div>
                 <div class="centerRight">
                   <p class="centerRightTitle" style="padding-top: 10px;">
@@ -5727,9 +5712,8 @@ export default {
 }
 .tabsBox {
   position: relative;
-
-  overflow-y: auto;
-  height: 450px;
+  // overflow-y: auto;
+  height: 560px;
 
 
 .el-tabs__item {
@@ -5763,7 +5747,7 @@ export default {
 
 .centerLeft {
   flex: 1;
-  display: flex;
+  // display: flex;
   flex-direction: column;
   position: relative;
   overflow-y: auto;
@@ -5771,7 +5755,7 @@ export default {
 
 .preTabs {
   height: 100%;
-  display: flex;
+  // display: flex;
   flex-direction: column;
 
 .el-tab-pane {

src/xt_pages/outpatientCharges/statementTemplate/printeEleven.vue

@@ -65,7 +65,7 @@
           <td width="8.1%">单价</td>
           <td width="8.1%">金额</td>
            <td width="10.1%">医保标识</td>
-<!--          <td width="10.1%">个人自付</td>-->
+
 
         </tr>
         <!-- width="72.6%"  16.82%  16.1-->
@@ -87,7 +87,7 @@
                 <div style="width: 8.1%;padding: 5px;text-align: center;">{{subItem.price}}</div>
                 <div style="width: 8.1%;padding: 5px;text-align: center;">{{subItem.total_price}}</div>
                  <div style="width: 10.1%;padding: 5px;"></div>
-<!--/*                <div style="width: 10.1%;padding: 5px;text-align: center;">{{subItem.psn_pay}}</div>*/-->
+
               </div>
             </div>
           </td>
@@ -107,7 +107,7 @@
           <td colspan="2" >医院盖章：</td>
         </tr>
         <tr>
-          <td colspan="8" style="padding-top: 20px;">医师签名：</td>
+          <td colspan="8" style="padding-top: 40px;">医师签名：</td>
         </tr>
       </table>
     </div>