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/components/chargeDialog.vue

@@ -46,6 +46,12 @@
       </el-form-item>
 
 
+
+      <el-form-item  v-if="form.pay_way == 5">
+          <el-button style="margin-left:10px;" type="primary" @click="reading">读卡</el-button>
+      </el-form-item>
+
+
       <el-form-item label="付款金额：" prop="id_card" :validate-event="is_Name">
         <el-input style="color: black"  type="number" v-model="form.pay_price" :disabled="true"></el-input>
       </el-form-item>
@@ -101,6 +107,7 @@
 
 <script>
   import { uParseTime } from '@/utils/tools'
+  import axios from "axios";
   const moment = require('moment')
   export default {
     name: 'chargeDialog',
@@ -109,6 +116,7 @@
 
       return {
         record_date:'',
+        org_id:this.$store.getters.xt_user.org_id,
         form: {
           medical_insurance_price:0,
           private_price:'',
@@ -181,6 +189,29 @@
       }
     },
     methods: {
+      reading() {
+        var that = this
+        let params = {
+          'id_card_type': 1,
+          'admin_user_id': this.$store.getters.xt_user.user.id,
+          'certificates':1,
+        }
+        axios.get('http://127.0.0.1:9532/zh/api/readcard', {
+          params: params
+        })
+            .then(function(response) {
+              if (response.data.state == 0) {
+                that.$message.error(response.data.msg)
+                return false
+              } else {
+                that.form.medicalInsuranceCard = response.data.data.number
+                that.$message({ message: '读卡成功', type: 'success' })
+              }
+            })
+            .catch(function(error) {
+
+            })
+      },
       show: function (total,order) {
         this.record_date = moment(new Date()).add('year',0).format("YYYY-MM-DD HH:mm")
         this.form.total = total

src/xt_pages/hospitalStation/invoiceTemplate/printThree.vue

@@ -7,7 +7,7 @@
                 <!-- 发票代码 -->
 
             </div>
-                
+
             <div  style="position: absolute;top:40px;left:300px"></div>
 
             <div style="position: absolute;top:40px;left:560px"></div>
@@ -23,10 +23,15 @@
             <!-- <div  style="position: absolute;left:560px;top:70px;">
 
             </div> -->
-             <div  style="position: absolute;left:650px;top:70px;">
-            <!-- 类别(改成城乡医保或者职工医保，具体对应住院的挂号选的那个医保) -->
+          <div  style="position: absolute;left:650px;top:70px;" v-if="insutype == '390'">
+            类别：城乡居民基本医疗保险
+          </div>
+          <div  style="position: absolute;left:650px;top:70px;" v-if="insutype == '310'">
+            类别：职工基本医疗保险
+          </div>
+          <div  style="position: absolute;left:650px;top:70px;" v-else>
             类别：
-            </div>
+          </div>
         </div>
 
         <div style="display:flex;justify-content: space-between;">
@@ -60,43 +65,43 @@
 
         <div style="display:flex;justify-content: space-between;">
             <div style="position: absolute;top:160px;left:40px">西药费</div>
-            <div style="position: absolute;top:160px;left:110px">{{ list.westernMedicineCostTotal }}</div>
+            <div style="position: absolute;top:160px;left:110px">{{ list.westernMedicineCostTotal?list.westernMedicineCostTotal:'0.00' }}</div>
             <div style="position: absolute;top:160px;left:220px">检查费</div>
-            <div style="position: absolute;top:160px;left:290px">{{ list.checkCostTotal }}</div>
+            <div style="position: absolute;top:160px;left:290px">{{ list.checkCostTotal?list.checkCostTotal:'0.00' }}</div>
             <div style="position: absolute;top:160px;left:400px">材料费</div>
-            <div style="position: absolute;top:160px;left:470px">0</div>
+            <div style="position: absolute;top:160px;left:470px">0.00</div>
             <div style="position: absolute;top:160px;left:580px">麻醉费</div>
-            <div style="position: absolute;top:160px;left:650px">0</div>
+            <div style="position: absolute;top:160px;left:650px">0.00</div>
         </div>
         <div style="display:flex;justify-content: space-between;">
             <div style="position: absolute;top:190px;left:40px">中成药费</div>
-            <div style="position: absolute;top:190px;left:110px">0</div>
+            <div style="position: absolute;top:190px;left:110px">0.00</div>
             <div style="position: absolute;top:190px;left:220px">治疗费</div>
-            <div style="position: absolute;top:190px;left:290px">{{list.treatCostTotal}}</div>
+            <div style="position: absolute;top:190px;left:290px">{{list.treatCostTotal?list.treatCostTotal:'0.00'}}</div>
             <div style="position: absolute;top:190px;left:400px">护理费</div>
-            <div style="position: absolute;top:190px;left:470px">0</div>
+            <div style="position: absolute;top:190px;left:470px">0.00</div>
             <div style="position: absolute;top:190px;left:580px">床位费</div>
-            <div style="position: absolute;top:190px;left:650px">0</div>
+            <div style="position: absolute;top:190px;left:650px">0.00</div>
         </div>
         <div style="display:flex;justify-content: space-between;">
             <div style="position: absolute;top:220px;left:40px">中草药费</div>
-            <div style="position: absolute;top:220px;left:110px">0</div>
+            <div style="position: absolute;top:220px;left:110px">0.00</div>
             <div style="position: absolute;top:220px;left:220px">手术费</div>
-            <div style="position: absolute;top:220px;left:290px">{{ list.operationCostTotal }}</div>
+            <div style="position: absolute;top:220px;left:290px">{{ list.operationCostTotal?list.operationCostTotal:'0.00' }}</div>
             <div style="position: absolute;top:220px;left:400px">输血费</div>
-            <div style="position: absolute;top:220px;left:470px">0</div>
+            <div style="position: absolute;top:220px;left:470px">0.00</div>
             <div style="position: absolute;top:220px;left:580px">取暖费</div>
-            <div style="position: absolute;top:220px;left:650px">0</div>
+            <div style="position: absolute;top:220px;left:650px">0.00</div>
         </div>
         <div style="display:flex;justify-content: space-between;">
             <div style="position: absolute;top:250px;left:40px">高压氧费</div>
-            <div style="position: absolute;top:250px;left:110px">0</div>
+            <div style="position: absolute;top:250px;left:110px">0.00</div>
             <div style="position: absolute;top:250px;left:220px">化验费</div>
-            <div style="position: absolute;top:250px;left:290px">{{ list.laboratoryCostTotal }}</div>
+            <div style="position: absolute;top:250px;left:290px">{{ list.laboratoryCostTotal?list.laboratoryCostTotal:'0.00' }}</div>
             <div style="position: absolute;top:250px;left:400px">氧气费</div>
-            <div style="position: absolute;top:250px;left:470px">0</div>
+            <div style="position: absolute;top:250px;left:470px">0.00</div>
             <div style="position: absolute;top:250px;left:580px">其他费</div>
-            <div style="position: absolute;top:250px;left:650px">{{ list.otherCostTotal }}</div>
+            <div style="position: absolute;top:250px;left:650px">{{ list.otherCostTotal?list.otherCostTotal:'0.00' }}</div>
         </div>
 
         <div>
@@ -159,22 +164,22 @@
 
         <div style="position: absolute;top:310px;left:40px">
             <!-- 个人账户支付 -->
-          个人账户支付：{{list.order.acct_pay?list.order.acct_pay:'0'}}
+          个人账户支付：{{list.order.acct_pay?list.order.acct_pay:'0.00'}}
         </div>
         <div style="position: absolute;top:310px;left:250px">
             <!-- 统筹支付 -->
-          统筹支付:{{list.order.hifp_pay?list.order.hifp_pay:'0'}}
+          统筹支付:{{list.order.hifp_pay?list.order.hifp_pay:'0.00'}}
         </div>
         <div style="position: absolute;top:310px;left:480px">
-          现金支付:{{list.order.psn_cash_pay?list.order.psn_cash_pay:'0'}}
+          现金支付:{{list.order.psn_cash_pay?list.order.psn_cash_pay:'0.00'}}
           <!-- 现金支付 -->
         </div>
         <div style="position: absolute;top:340px;left:40px">
-          公务员补助:{{list.order.cvlserv_pay?list.order.cvlserv_pay:'0'}}
+          公务员补助:{{list.order.cvlserv_pay?list.order.cvlserv_pay:'0.00'}}
           <!-- 公务员补助 -->
         </div>
         <div style="position: absolute;top:340px;left:250px">
-          医疗救助:{{list.order.maf_pay?list.order.maf_pay:'0'}}
+          医疗救助:{{list.order.maf_pay?list.order.maf_pay:'0.00'}}
           <!-- 医疗救助 -->
         </div>
         <!-- 大病 -->
@@ -189,15 +194,15 @@
         </div> -->
         <div style="position: absolute;top:370px;left:40px">
             <!-- 预交款合计 -->
-            预交款合计:0
+            预交款合计:
         </div>
         <div style="position: absolute;top:370px;left:250px">
             <!-- 补交款 -->
-            补交款:0
+            补交款:
         </div>
         <div style="position: absolute;top:370px;left:480px">
             <!-- 应退款 -->
-            应退款:0
+            应退款:
         </div>
         <div>
             <div style="position: absolute;top:400px;left:40px">
@@ -241,6 +246,7 @@ export default {
           in_hosptial_time:'',
           out_hosptial_time:'',
           number:'',
+          insutype:'',
         }
     },
     mounted(){
@@ -295,7 +301,7 @@ export default {
                 this.in_hosptial_time = this.list.his_hospital_record.in_hosptial_time.split(' ')[0]
                 this.out_hosptial_time = this.list.his_hospital_record.out_hosptial_time.split(' ')[0]
               }
-
+              this.insutype = this.list.order.insutype
               this.id_card_no = this.list.his_hospital_record.id_card_no
               this.number = this.list.his_hospital_record.number
               this.psn_no = this.list.his_hospital_record.psn_no

src/xt_pages/hospitalStation/shouJuTemplate/shouJuPrintOne.vue

@@ -43,43 +43,43 @@
 
     <div style="display:flex;justify-content: space-between;">
       <div style="position: absolute;top:160px;left:40px">西药</div>
-      <div style="position: absolute;top:160px;left:110px">{{ list.westernMedicineCostTotal }}</div>
+      <div style="position: absolute;top:160px;left:110px">{{ list.westernMedicineCostTotal?list.westernMedicineCostTotal:"0.00" }}</div>
       <div style="position: absolute;top:160px;left:180px">检查费</div>
-      <div style="position: absolute;top:160px;left:260px">{{ list.checkCostTotal }}</div>
+      <div style="position: absolute;top:160px;left:260px">{{ list.checkCostTotal?list.checkCostTotal:"0.00" }}</div>
       <div style="position: absolute;top:160px;left:340px">护理费</div>
-      <div style="position: absolute;top:160px;left:420px"></div>
+      <div style="position: absolute;top:160px;left:420px">0.00</div>
       <div style="position: absolute;top:160px;left:500px">麻醉费</div>
-      <div style="position: absolute;top:160px;left:580px"></div>
+      <div style="position: absolute;top:160px;left:580px">0.00</div>
     </div>
     <div style="display:flex;justify-content: space-between;">
       <div style="position: absolute;top:190px;left:40px">中成药费</div>
-      <div style="position: absolute;top:190px;left:110px"></div>
+      <div style="position: absolute;top:190px;left:110px">0.00</div>
       <div style="position: absolute;top:190px;left:180px">治疗费</div>
-      <div style="position: absolute;top:190px;left:260px">{{list.treatCostTotal}}</div>
+      <div style="position: absolute;top:190px;left:260px">{{list.treatCostTotal?list.treatCostTotal:"0.00"}}</div>
       <div style="position: absolute;top:190px;left:340px">CT核磁</div>
-      <div style="position: absolute;top:190px;left:420px"></div>
+      <div style="position: absolute;top:190px;left:420px">0.00</div>
       <div style="position: absolute;top:190px;left:500px">床位费</div>
-      <div style="position: absolute;top:190px;left:580px"></div>
+      <div style="position: absolute;top:190px;left:580px">0.00</div>
     </div>
     <div style="display:flex;justify-content: space-between;">
       <div style="position: absolute;top:220px;left:40px">中草药费</div>
-      <div style="position: absolute;top:220px;left:110px"></div>
+      <div style="position: absolute;top:220px;left:110px">0.00</div>
       <div style="position: absolute;top:220px;left:180px">手术费</div>
-      <div style="position: absolute;top:220px;left:260px">{{ list.operationCostTotal }}</div>
+      <div style="position: absolute;top:220px;left:260px">{{ list.operationCostTotal?list.operationCostTotal:'0.00' }}</div>
       <div style="position: absolute;top:220px;left:340px">输血费</div>
-      <div style="position: absolute;top:220px;left:420px"></div>
+      <div style="position: absolute;top:220px;left:420px">0.00</div>
       <div style="position: absolute;top:220px;left:500px">取暖费</div>
-      <div style="position: absolute;top:220px;left:580px"></div>
+      <div style="position: absolute;top:220px;left:580px">0.00</div>
     </div>
     <div style="display:flex;justify-content: space-between;">
       <div style="position: absolute;top:250px;left:40px">高压氧费</div>
-      <div style="position: absolute;top:250px;left:110px"></div>
+      <div style="position: absolute;top:250px;left:110px">0.00</div>
       <div style="position: absolute;top:250px;left:180px">化验费</div>
-      <div style="position: absolute;top:250px;left:260px">{{ list.laboratoryCostTotal }}</div>
+      <div style="position: absolute;top:250px;left:260px">{{ list.laboratoryCostTotal?list.laboratoryCostTotal:"0.00" }}</div>
       <div style="position: absolute;top:250px;left:340px">氧气费</div>
-      <div style="position: absolute;top:250px;left:420px"></div>
+      <div style="position: absolute;top:250px;left:420px">0.00</div>
       <div style="position: absolute;top:250px;left:500px">其他</div>
-      <div style="position: absolute;top:250px;left:580px">{{ list.otherCostTotal }}</div>
+      <div style="position: absolute;top:250px;left:580px">{{ list.otherCostTotal?list.otherCostTotal:"0.00" }}</div>
     </div>
 
     <div>
@@ -139,33 +139,33 @@
 
     <div style="position: absolute;top:310px;left:320px">
       <!-- 个人账户支付 -->
-      {{list.order.acct_pay?list.order.acct_pay:''}}
+      {{list.order.acct_pay?list.order.acct_pay:'0.00'}}
     </div>
     <div style="position: absolute;top:310px;left:380px">
       <!-- 统筹支付 -->
-      {{list.order.hifp_pay?list.order.hifp_pay:''}}
+      {{list.order.hifp_pay?list.order.hifp_pay:'0.00'}}
     </div>
     <div style="position: absolute;top:310px;left:500px">
-      {{list.order.psn_cash_pay?list.order.psn_cash_pay:''}}
+      {{list.order.psn_cash_pay?list.order.psn_cash_pay:'0.00'}}
       <!-- 现金支付 -->
     </div>
     <div style="position: absolute;top:340px;left:320px">
-      {{list.order.cvlserv_pay?list.order.cvlserv_pay:''}}
+      {{list.order.cvlserv_pay?list.order.cvlserv_pay:'0.00'}}
       <!-- 公务员补助 -->
     </div>
     <div style="position: absolute;top:340px;left:380px">
-      {{list.order.maf_pay?list.order.maf_pay:''}}
+      {{list.order.maf_pay?list.order.maf_pay:'0.00'}}
       <!-- 医疗救助 -->
     </div>
     <div style="position: absolute;top:340px;left:500px">
       <!-- 大病 -->
-      {{list.order.hifmi_pay?list.order.hifmi_pay:''}}
+      {{list.order.hifmi_pay?list.order.hifmi_pay:'0.00'}}
 
 
     </div>
     <div style="position: absolute;top:340px;left:560px">
       <!-- 其他基金支付 -->
-      {{list.order.oth_pay?list.order.oth_pay:''}}
+      {{list.order.oth_pay?list.order.oth_pay:'0.00'}}
 
     </div>
     <div style="position: absolute;top:370px;left:320px">

src/xt_pages/outpatientCharges/listTemplate/printTwo10265.vue

@@ -58,10 +58,10 @@
         </tr>
 
         <tr>
-          <td style="width: 20%;white-space: nowrap;">甲类：{{item.jiaTotal}}</td>
-          <td style="width: 20%;white-space: nowrap;">乙类药品：{{item.yiTotal}}</td>
+          <td style="width: 20%;white-space: nowrap;">甲类：{{item.jiaTotal?item.jiaTotal:"0.00"}}</td>
+          <td style="width: 20%;white-space: nowrap;">乙类药品：{{item.yiTotal?item.yiTotal:"0.00"}}</td>
           <td style="width: 5%;white-space: nowrap;">非药品：{{0.00}}</td>
-          <td style="width: 5%;white-space: nowrap;">丙类：{{item.bingTotal}}</td>
+          <td style="width: 5%;white-space: nowrap;">丙类：{{item.bingTotal?item.bingTotal:"0.00"}}</td>
           <td style="width: 5%;white-space: nowrap;">其他：{{0.00}}</td>
           <td></td>
           <td style="width: 20%;white-space: nowrap;">小计：{{item.total}}</td>
@@ -87,9 +87,9 @@
 
         <tr>
           <td>报销类别费用合计</td>
-          <td>甲类：{{getJaiTotal()}}</td>
-          <td>乙类药品：{{getYiTotal()}}</td>
-          <td>丙类：{{getBingTotal()}}</td>
+          <td>甲类：{{getJaiTotal()?getJaiTotal():"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>