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

src/xt_pages/hospitalStation/doctorDesk.vue

@@ -6,7 +6,6 @@
         <div class="app-container" style="display:flex;flex: 1;padding: 10px 20px 0px 20px;">
             <div class="mainLeft">
 
-
                 <el-date-picker
                         v-model="record_date"
                         prefix-icon="el-icon-date"
@@ -20,7 +19,6 @@
                         value-format="yyyy-MM-dd">
                 </el-date-picker>
 
-
                 <div class="mainCell" style="justify-content: space-between;">
                     <p style="font-size:14px;">未就诊：<span>{{cal_one}}</span>人</p>
                     <p style="font-size:14px;">已就诊：<span>{{cal_two}}</span>人</p>

src/xt_pages/hospitalStation/invoiceTemplate/printThree.vue

@@ -194,15 +194,15 @@
         </div> -->
         <div style="position: absolute;top:370px;left:40px">
             <!-- 预交款合计 -->
-            预交款合计:
+            预交款合计:0.00
         </div>
         <div style="position: absolute;top:370px;left:250px">
             <!-- 补交款 -->
-            补交款:
+            补交款:0.00
         </div>
         <div style="position: absolute;top:370px;left:480px">
             <!-- 应退款 -->
-            应退款:
+            应退款:0.00
         </div>
         <div>
             <div style="position: absolute;top:400px;left:40px">

src/xt_pages/hospitalStation/listTemplate/printTwo.vue

@@ -6,7 +6,7 @@
       </div>
       <!-- <div class="listTitle" :style="{position: 'absolute',top:(20 + (index * 160))  + 'px',left:200+ 'px',}">赤峰市肿瘤医院病人费用明细清单</div> -->
       <div class="listInfo">
-        <div>个人编码:{{order.psn_no}}</div>
+        <div>个人编号:{{order.psn_no}}</div>
         <div>住院号：{{ patient.dialysis_no }}</div>
         <div>次数：</div>
         <div>姓名：{{ patient.name }}</div>
@@ -377,7 +377,6 @@
           <td>甲类：</td>
           <td>乙类药品：</td>
           <td>丙类：</td>
-          <td>非药品：</td>
           <td></td>
           <td>其他：</td>
         </tr>

src/xt_pages/hospitalStation/settlementTemplate/hospitalSettlePrint.vue

@@ -23,7 +23,7 @@
       </div>
     </div>
     <div class="row">
-      <div>医保编号<div style="width:220px;" class="under_line">{{ info.psn_no }}</div></div>
+      <div>个人编号<div style="width:220px;" class="under_line">{{ info.psn_no }}</div></div>
       <div>病案号<div style="width:220px;" class="under_line">{{ info.psn_no ? info.psn_no : '' }}</div></div>
       <div>申报时间
         <div style="width:40px;" class="under_line">{{ info.setl_time ? info.setl_time.split(' ')[0].slice(0,4) : '' }}</div>年
@@ -46,8 +46,8 @@
                 <div style="width:80px;" class="under_line">{{info.psn_name}}</div>
               </div>
               <div class="inline_block">性别
-                <label-box :isChecked="info.gend == '1'" showValue="男"></label-box>
-                <label-box :isChecked="info.gend == '2'" showValue="女"></label-box>
+                 <div style="width:80px;" class="under_line" v-if="info.gend == '1'">{{'男'}}</div>
+                 <div style="width:80px;" class="under_line" v-if="info.gend == '2'">{{'女'}}</div>
               </div>
               <div class="inline_block">出生日期
                 <div style="width:40px;" class="under_line">{{info.brdy.slice(0,4)}}</div>年

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -206,8 +206,8 @@
       </el-form-item>
 
 
-      <el-button style="margin-left:10px;" type="primary" @click="check11" >查普通门诊待遇</el-button>
-      <el-button style="margin-left:10px;" type="primary" @click="check14" >查门诊大病待遇</el-button>
+<!--      <el-button style="margin-left:10px;" type="primary" @click="check11" >查普通门诊待遇</el-button>-->
+<!--      <el-button style="margin-left:10px;" type="primary" @click="check14" >查门诊大病待遇</el-button>-->
 
     </el-form>
 

src/xt_pages/outpatientCharges/listPrint.vue

@@ -394,11 +394,12 @@
             break
           case '13':
             return '挂号费'
-
             break
           case '14':
             return '其他费'
-
+            break
+          case '0':
+            return '其他费'
             break
 
         }

src/xt_pages/outpatientCharges/listTemplate/printTwo10265.vue

@@ -4,7 +4,7 @@
       <div class="listTitle">{{$store.getters.xt_user.org.org_name}}费用清单</div>
       <!-- <div class="listTitle" :style="{position: 'absolute',top:(20 + (index * 160))  + 'px',left:200+ 'px',}">赤峰市肿瘤医院病人费用明细清单</div> -->
       <div class="listInfo">
-        <div>个人编码:{{order.psn_no}}</div>
+        <div>个人编号:{{order.psn_no}}</div>
         <div>住院号：{{ order.mdtrt_id }}</div>
 <!--        <div>次数：</div>-->
         <div>姓名：{{ order.psn_name }}</div>
@@ -87,9 +87,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>