Merge branch 'master' of https://172.16.32.165/lighter/vue-intergration-platform

src/components/medical-insurance/readcard/Index.vue

@@ -1,18 +1,29 @@
 <template>
   <el-dropdown style="margin: 0 10px" trigger="click" @command="beforeReadCard">
-    <el-button type="primary"
-      >读卡&nbsp;<el-icon><ArrowDown /></el-icon>
+    <el-button type="primary">读卡&nbsp
+      <el-icon>
+        <ArrowDown/>
+      </el-icon>
     </el-button>
     <template #dropdown>
       <el-dropdown-menu>
         <el-dropdown-item command="sicard">
-          <el-icon><CreditCard /></el-icon>社保卡
+          <el-icon>
+            <CreditCard/>
+          </el-icon>
+          社保卡
         </el-dropdown-item>
         <el-dropdown-item command="qrcode">
-          <el-icon><Grid /></el-icon>电子凭证
+          <el-icon>
+            <Grid/>
+          </el-icon>
+          电子凭证
         </el-dropdown-item>
         <el-dropdown-item command="idcard">
-          <el-icon><User /></el-icon>身份证
+          <el-icon>
+            <User/>
+          </el-icon>
+          身份证
         </el-dropdown-item>
       </el-dropdown-menu>
     </template>
@@ -36,9 +47,10 @@
 </template>
 
 <script>
-import { ElMessage, ElMessageBox } from 'element-plus'
+import {ElMessage, ElMessageBox} from 'element-plus'
 import axios from 'axios'
-import { startLoading, endLoading } from '@/utils/loading'
+import {startLoading, endLoading} from '@/utils/loading'
+
 export default {
   props: {
     patNo: {
@@ -94,33 +106,36 @@ export default {
       }
       const param = `${cardtype}_${nowbiztype}`
       axios('http://localhost:8321/readcard/entry?param=' + param)
-        .then((res) => {
-          endLoading()
-          if (res.data.code === 200) {
-            const result = {
-              mdtrtCertType: cardtype,
-              readCardResult: cardtype === 'qrcode' ? JSON.stringify(JSON.parse(res.data.data).data) : res.data.data,
-              readCardBizType: nowbiztype,
+          .then((res) => {
+            endLoading()
+            if (res.data.code === 200) {
+              const result = {
+                mdtrtCertType: cardtype,
+                readCardResult: cardtype === 'qrcode' ? JSON.stringify(JSON.parse(res.data.data).data) : res.data.data,
+                readCardBizType: nowbiztype,
+              }
+              ctx.emit('success', result)
+              ElMessageBox.alert(res.data.message, '提示', {
+                type: 'success',
+                showCancelButton: false,
+              }).then(() => {
+              })
+            } else {
+              ElMessageBox.alert(res.data.message.trim(), '错误', {
+                type: 'error',
+                showCancelButton: false,
+              }).then(() => {
+              })
             }
-            ctx.emit('success', result)
-            ElMessageBox.alert(res.data.message, '提示', {
-              type: 'success',
-              showCancelButton: false,
-            }).then(() => {})
-          } else {
-            ElMessageBox.alert(res.data.message.trim(), '错误', {
+          })
+          .catch((e) => {
+            endLoading()
+            ElMessageBox.alert(e, '错误', {
               type: 'error',
               showCancelButton: false,
-            }).then(() => {})
-          }
-        })
-        .catch((e) => {
-          endLoading()
-          ElMessageBox.alert(e, '错误', {
-            type: 'error',
-            showCancelButton: false,
-          }).then(() => {})
-        })
+            }).then(() => {
+            })
+          })
     }
 
     return {

src/views/medical-insurance/inpatient/AdmRegistration.vue

@@ -12,7 +12,6 @@
     <el-main>
       <el-tag type="info">病人基本信息</el-tag>
       <div style="height: 4px"></div>
-
       <el-descriptions :column="3" border>
         <el-descriptions-item>
           <template #label> 住院号 </template>
@@ -304,7 +303,7 @@ import { getZyInYbDiags, saveZyInYbDiags, submitSiPatientInfo } from '@/api/yiba
 import { getAllSpecialDiags } from '@/api/yibao/dictionary'
 import { fetchCountryDictionary, fetchNationDictionary, fetchRelationDictionary } from '@/api/dictionary/fetch-dictionaries'
 import { cptSex } from '@/utils/computed'
-import { admdvs, diagTypes, sexes } from '@/data/index'
+import { admdvs, diagTypes, sexes } from '@/data'
 import { nullPatient } from '@/utils/validate'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { admissRegister, revokeAdmission } from '@/api/medical-insurance/si-inpatient'

src/views/medical-insurance/inpatient/DiscSettlement.vue

@@ -94,6 +94,11 @@
             placeholder="请选择要断账的时间"
           ></el-date-picker>
         </div>
+        <div style="margin-bottom: 20px">
+          使用个人账户：
+          <el-radio size="large" v-model="settleApply.acctUsedFlag" label="1">是</el-radio>
+          <el-radio size="large" v-model="settleApply.acctUsedFlag" label="0">否</el-radio>
+        </div>
         <el-input type="textarea" v-model="settleApply.inputComment" placeholder="请输入申请理由"></el-input>
         <div style="width: 450px; text-align: right; margin-top: 30px">
           <el-button type="info" icon="Close" @click="cancelSettleApply">取消</el-button>
@@ -220,22 +225,23 @@
 </template>
 
 <script>
-import { computed, onActivated, onDeactivated, onMounted, reactive, ref, watchEffect } from 'vue'
+import {computed, onActivated, onDeactivated, onMounted, reactive, ref, watchEffect} from 'vue'
 import store from '@/store'
-import { cptSex, cptOperation, cptDisDiagStatus } from '@/utils/computed'
-import { genDismissActOrder, getDisDiag, receiveAndRecalculateCost } from '@/api/yibao/patient'
-import { dismissCalculate, getActOrders, selfPayDismiss } from '@/api/yibao/dismiss'
-import { getDatetime, formatDatetime } from '@/utils/date'
-import { nullPatient } from '@/utils/validate'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { dischargeProcessing, revokeSettlement } from '@/api/medical-insurance/si-inpatient'
-import { getSiPatInfo } from '@/api/medical-insurance/si-query'
-import { getDetailConventions, getRoughConventions, retractConventions } from '@/api/yibao/conventions'
-import { getGreatestRole } from '@/utils/permission'
-import { injurySettlement, revokeInjurySettlement } from '@/api/medical-insurance/si-injury'
-import { selectSettleApply, submitSettleApply } from '@/api/medical-insurance/si-settle-apply'
-import { baseinfo } from '@/data/inpatient'
+import {cptOperation, cptSex} from '@/utils/computed'
+import {genDismissActOrder, getDisDiag, receiveAndRecalculateCost} from '@/api/yibao/patient'
+import {dismissCalculate, getActOrders, selfPayDismiss} from '@/api/yibao/dismiss'
+import {formatDatetime, getDatetime} from '@/utils/date'
+import {nullPatient} from '@/utils/validate'
+import {ElMessage, ElMessageBox} from 'element-plus'
+import {dischargeProcessing, revokeSettlement} from '@/api/medical-insurance/si-inpatient'
+import {getSiPatInfo} from '@/api/medical-insurance/si-query'
+import {getDetailConventions, getRoughConventions, retractConventions} from '@/api/yibao/conventions'
+import {getGreatestRole} from '@/utils/permission'
+import {injurySettlement, revokeInjurySettlement} from '@/api/medical-insurance/si-injury'
+import {selectSettleApply, submitSettleApply} from '@/api/medical-insurance/si-settle-apply'
+import {baseinfo} from '@/data/inpatient'
 import ReadCard from '@/components/medical-insurance/readcard/Index.vue'
+
 export default {
   components: {
     ReadCard,
@@ -378,6 +384,7 @@ export default {
               settleApply.value.ledgerSn = patient.value.ledgerSn
               settleApply.value.type = midSetl ? 2 : 1
               settleApply.value.settleDatetime = res.settleDatetime
+              settleApply.value.acctUsedFlag = '0'
               settleApply.value.inputComment = midSetl ? null : '医嘱离院。'
               showSettleApplyForm.value = true
             })
@@ -398,6 +405,7 @@ export default {
               })
               break
             case 1:
+              patient.value.acctUsedFlag = res.acctUsedFlag
               if (res.settleDatetime) {
                 patient.value.zjdzDatetime = res.settleDatetime
                 fetchActOrders()
@@ -718,7 +726,6 @@ export default {
       cptOperation,
       diags,
       tableHeight,
-      cptDisDiagStatus,
       settleApply,
       showSettleApplyForm,
       showZjdzDate,
@@ -767,11 +774,10 @@ function getBalance(val) {
 }
 
 function initDiags() {
-  const diags = reactive({
+  return reactive({
     yb: [],
     bl: [],
   })
-  return diags
 }
 
 function getOrderStatus(val) {