Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web

src/components/charge/CheckoutDetail.vue

@@ -1,10 +1,6 @@
 <template>
-  <Mask :top="50" :height="650" :width="900" :is-show="show">
+  <Mask :top="50" :height="650" :width="900" :is-show="show" title="追溯码采集" @close="show = false" :show-footer="true">
-    <CloseBtn @click="show = false"></CloseBtn>
     <el-card>
-      <template #header>
-        <div class="header">追溯码采集</div>
-      </template>
       <div class="detail">
         <el-input placeholder="请输入追溯码" v-model="inputIdCode" clearable @keydown.enter="openAssociationIdCode()">
           <template #prefix>
@@ -44,13 +40,13 @@
         </div>
 
       </div>
+    </el-card>
     <template #footer>
       <div class="bottom-btn">
         <el-button @click="saveRetail()" type="primary">确定</el-button>
         <el-button @click="show = false">关闭</el-button>
       </div>
     </template>
-    </el-card>
     <AssociationIdCode
         ref="associationIdCodeRef"
         @addIdCode="cleanInputIdCode"
@@ -58,7 +54,7 @@
   </Mask>
 </template>
 <script setup lang="ts">
-import Mask from "@/components/Mask.vue";
+import Mask from "@/components/common/Mask.vue";
 import CloseBtn from "@/components/CloseBtn.vue";
 import {nextTick, ref} from "vue";
 import IdCodeListShow from "@/components/charge/IdCodeListShow.vue";

src/components/charge/PersonalPayment.vue

@@ -1,10 +1,6 @@
 <template>
-<Mask :is-show="show" :width=500 :height="500">
+  <Mask :is-show="show" :width=500 :height="500" title="个人现金部分" @close="show=false" :show-footer="true">
     <div class="container-wrapper">
-    <CloseBtn @click="show = false"></CloseBtn>
-    <div class="header">
-      个人现金部分
-    </div>
       <div class="container">
         <div>
           总金额：{{ socialPayInfo.setlinfo.medfee_sumamt }}<br>
@@ -28,17 +24,19 @@
         </div>
 
       </div>
-    <el-button type="primary" @click="completeSettlement">完成订单</el-button>
-    <el-button  @click="cecalOrder">取消订单</el-button>
-
 
     </div>
-
+    <template #footer>
+      <div class="bottom">
+        <el-button type="primary" @click="completeSettlement">完成订单</el-button>
+        <el-button @click="cecalOrder">取消订单</el-button>
+      </div>
+    </template>
   </Mask>
 </template>
 <script setup lang="ts">
 
-import Mask from "@/components/Mask.vue";
+import Mask from "@/components/common/Mask.vue";
 import {nextTick, ref} from "vue";
 import {priceBtnListNoSocial} from "@/assets/config/constants.ts";
 import CloseBtn from "@/components/CloseBtn.vue";
@@ -75,7 +73,6 @@ const completeSettlement = ()=>{
     insutype: orderInfo.value.insutype,
     changeOrderCode: orderInfo.value.changeOrderCode,
   }
-
   post("charge/socialRealPay", {...params}).then((res: any) => {
     show.value = false;
     emit('orderCompleted')
@@ -83,8 +80,6 @@ const completeSettlement = ()=>{
 }
 
 
-
-
 const cecalOrder = () => {
   ElMessageBox.confirm(
       `取消后不能恢复，是否确定取消当前订单？`,
@@ -127,6 +122,7 @@ const orderCanceled = ()=>{
   justify-content: space-between;
   flex-wrap: wrap;
   align-items: center;
+
   .btn {
     height: 45px;
     width: 95px;
@@ -139,6 +135,7 @@ const orderCanceled = ()=>{
     align-items: center;
     padding: 10px;
     cursor: pointer;
+
     .image {
       width: 16px;
       height: 16px;
@@ -163,4 +160,11 @@ const orderCanceled = ()=>{
   }
 
 }
+.bottom{
+  height: 100%;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0 24px;
+}
 </style>

src/components/charge/Settlement.vue

@@ -1,5 +1,5 @@
 <template>
-  <Mask :width="696" :height="409" title="收费" :is-show="show" @close="show = false" :show-footer="true">
+  <Mask :width="696" :height="409" title="收费" :is-show="show" @close="close" :show-footer="true">
     <template #default>
       <div class="content">
         <div class="btns">
@@ -66,26 +66,30 @@ const socialCard = ref<any>({
   data: null,
   mdtrtCertType: null,
   mdtrtCertNo: null,
-  payInfo: {
+  payInfo: {}
-  }
 });
 
 const show = ref(false)
 const printReceipt = ref(false);
 const payType = ref(null);
 const retailOrder = ref<any>(null);
+const close = () => {
+  show.value = false;
+  payType.value = null;
+  selectedIndex.value = null
+}
 const init = async (code: any, psnNo: any) => {
   retailOrder.value = await post("charge/getByCode", {code: code});
   if (psnNo != null) {
     let result: any = await post("social/person/getSocialInfoByPsnNo", {psnNo: psnNo});
+    if (result) {
       socialCard.value.data = result;
       socialCard.value.mdtrtCertType = result.mdtrtCertType;
       socialCard.value.mdtrtCertNo = result.mdtrtCertNo;
       socialCard.value.payInfo.selfpay_prop_type = result.insuinfo[0].insutype;
     }
-
+  }
   show.value = true;
-
 }
 defineExpose({init})
 const changePriceType = (type: any, index: any) => {
@@ -98,6 +102,7 @@ const completeSettlement = () => {
     return;
   }
   if (payType.value == null) {
+    ElMessage.warning("请选择支付方式")
     return
   }
   if (payType.value == 1) {
@@ -135,6 +140,10 @@ const getBalcByInsutype = (type: any) => {
 }
 
 const socialSettlement = () => {
+  if (socialCard.value.data == null) {
+    ElMessage.warning("请刷卡")
+    return;
+  }
   const params = {
     mdtrtCertType: socialCard.value.mdtrtCertType,
     mdtrtCertNo: socialCard.value.mdtrtCertNo,

src/components/inventory/purchase/AddOrder.vue

@@ -111,21 +111,20 @@
           <el-table-column label="生产日期" width="140">
             <template #default="scope">
               <el-date-picker
-                  :editable="false"
                   v-model="scope.row.productionDate"
                   type="date"
                   value-format="YYYY-MM-DD"
                   placeholder="生产日期"
                   size="small"
                   @change="checkProductionDate(scope.row)"
-                  style="width: 100px;"/>
+                  style="width: 100px;"
+                  @input="inputProductionDate(scope.row)"
+              />
             </template>
-
           </el-table-column>
           <el-table-column label="有效日期" width="140">
             <template #default="scope">
               <el-date-picker
-                  :editable="false"
                   v-model="scope.row.expiryDate"
                   type="date"
                   value-format="YYYY-MM-DD"
@@ -215,7 +214,12 @@ const checkProductionDate = (row: any) => {
   }
   return true;
 };
-
+const inputProductionDate= (row: any) => {
+  console.log(row)
+  if (row.productionDate && row.expiryDate) {
+    checkExpiryDate(row);
+  }
+}
 const checkExpiryDate = (row: any) => {
   if (!row.expiryDate) {
     ElMessage.error('有效期不能为空');

src/components/member/memberProfile/VipEdit.vue

@@ -3,7 +3,7 @@
         :show-footer="true">
     <template #default>
       <el-scrollbar>
-        <div class="content">
+        <div class="content" v-loading="loading">
           <el-form
               :model="ruleForm"
               label-width="auto"
@@ -12,9 +12,9 @@
           >
             <el-row>
               <el-col :span="12">
-                <el-form-item label="会员等级">
+                <el-form-item label="等级">
                   <el-select
-                      v-model="ruleForm.levelId"
+                      v-model="ruleForm.exp"
                       placeholder="等级"
                       size="default"
                       style="width: 100%"
@@ -23,7 +23,7 @@
                         v-for="item in levelList"
                         :key="item.id"
                         :label="item.name"
-                        :value="item.levelId"
+                        :value="item.startExp"
                     />
                   </el-select>
                 </el-form-item>
@@ -140,41 +140,173 @@
               <el-input v-model="ruleForm.allergyHistory"></el-input>
             </el-form-item>
           </el-form>
+          <h5 v-if="!isShowCard" style="margin:24px 0;font-size: 16px">险种列表</h5>
+          <el-table
+              :data="tableData"
+              style="width: 100%;"
+              v-if="!isShowCard"
+              height="160"
+          >
+            <el-table-column label="险种类型" prop="insutype">
+              <template #default="scope">
+                {{ getKey(insutypes, scope.row.insutype) }}
+              </template>
+            </el-table-column>
+            <el-table-column label="待遇状态">
+            </el-table-column>
+            <el-table-column label="参保日期" prop="psn_insu_date"></el-table-column>
+            <el-table-column label="剩余余额" prop="balc">
+              <template #default="scope">
+                ￥{{ scope.row.balc || 0 }}
+              </template>
+            </el-table-column>
+          </el-table>
         </div>
       </el-scrollbar>
     </template>
     <template #footer>
       <div class="bottom">
+        <el-dropdown v-if="isShowCard" placement="top-start" @show="showCardBtn" @hide="hide"
+                     :disabled="ruleForm.status==0">
+          <div class="left" style="outline: none;">
+            <span class="btnCard" type="primary">
+              <img class="image" src="/static/images/registration/card.png" alt=""
+                   srcset="">{{ ruleForm.status == 0 ? '不能读卡' : '进行读卡' }}
+              <img class="image1" :src="'/static/images/registration/'+(showBtn?2:1)+'.png'" alt="" srcset="">
+            </span>
+          </div>
+          <template #dropdown>
+            <CardDefault ref="cardDefaultRef" v-model="socialCard" @socialCardUpdate="socialCardUpdate"
+                         @close="deleteCard" @changeLoading="changeLoading"/>
+          </template>
+        </el-dropdown>
+        <div class="closeBtn" v-else @click="deleteCard" style="outline: none;">
+          <img class="image" src="/static/images/registration/card.png" alt="" srcset="">
+          退出医保
+        </div>
+        <div class="bottom-right">
           <el-button @click="close">取消</el-button>
           <el-button type="primary" @click="submitForm">
             保存
           </el-button>
         </div>
+      </div>
     </template>
   </Mask>
 </template>
 <script setup lang="ts">
-import {onMounted, ref} from "vue"
+import {nextTick, onMounted, ref} from "vue"
-import {ElForm, ElFormItem, ElSelect, ElOption, ElRow, ElCol, ElRadioGroup, type FormInstance} from "element-plus";
+import {
+  ElForm,
+  ElFormItem,
+  ElSelect,
+  ElOption,
+  ElRow,
+  ElCol,
+  ElRadioGroup,
+  type FormInstance,
+  ElMessageBox
+} from "element-plus";
 import SelectArea from "@/components/SelectArea.vue";
 import {post} from "@/utils/request.ts";
 import Mask from "@/components/common/Mask.vue";
 import psnCertTypes from "@/assets/config/directory/psnCertTypes.json"
 import antys from '@/assets/config/directory/antys.json'
 import {formatDate} from "@/utils/dateUtils.ts";
+import CardDefault from "@/components/registration/CardDefault.vue";
+import {getKey} from "@/utils/discrotyUtil.ts";
+import insutypes from "@/assets/config/directory/insutypes.json";
 
 
 const ruleFormRef = ref<FormInstance>()
 const id = ref<any>(null)
 const show = ref<boolean>(false)
 const emit = defineEmits(['close'])
+const antysList = ref<any>(Object.entries(antys)
+    .map(([id, name]) => ({id: Number(id), name}))
+    .sort((a, b) => a.id - b.id))
+const cardTypeList = ref<any>(Object.entries(psnCertTypes)
+    .map(([id, name]) => ({id: Number(id), name}))
+    .sort((a, b) => a.id - b.id))
+const showBtn = ref(false)
+const height = ref<any>(470)
 const close = () => {
   ruleForm.value = {}
   id.value = ''
   show.value = false
+  isShowCard.value = true
+  nextTick(() => {
+    cardDefaultRef.value?.close()
+    height.value = 470
+  })
   emit('close')
 }
+const showCardBtn = () => {
+  showBtn.value = true
+}
+const hide = () => {
+  showBtn.value = false
+}
+const isShowCard = ref<any>(true)
+const tableData = ref<any>([])
+const socialCard: any = ref({
+  data: null,
+  payInfo: {},
+  lastUse: null
+})
+const socialCardUpdate = (e: any) => {
+  isShowCard.value = false
+  if (e) {
+    console.log(e, '123456')
+    isShowCard.value = false
+    ruleForm.value.sex = Number(e.data.baseinfo.gend)
+    ruleForm.value.name = e.data.baseinfo.psn_name
+    ruleForm.value.certType = Number(e.data.baseinfo.psn_cert_type)
+    ruleForm.value.nation = Number(e.data.baseinfo.naty)
+    ruleForm.value.certNo = e.data.baseinfo.certno
+    ruleForm.value.age = Math.floor(e.data.baseinfo.age)
+    tableData.value = e.data.insuinfo
+    // if (ruleForm.value.certNo) {
+    //   post('vip/vip/list', {
+    //     keyword: ruleForm.value.certNo,
+    //     page: 1,
+    //     pageSize: 50
+    //   }).then((res: any) => {
+    //     ruleForm.value.name = res.list[0].name
+    //     ruleForm.value.sex = res.list[0].sex
+    //     ruleForm.value.phone = res.list[0].phone
+    //     ruleForm.value.certType = Number(res.list[0].certType)
+    //     ruleForm.value.certNo = res.list[0].certNo
+    //     ruleForm.value.memo = res.list[0].remark
+    //     ruleForm.value.visitType = 1
+    //   })
+    // }
+  }
+// }
 
+  loading.value = false
+}
+const loading = ref(false)
+const changeLoading = (e: any) => {
+  loading.value = e
+}
+const cardDefaultRef = ref<any>("")
+const deleteCard = () => {
+  ElMessageBox.confirm("退出识别", "提示", {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    callback: (action: any) => {
+      if (action == "confirm") {
+        isShowCard.value = true
+        ruleForm.value = {}
+        tableData.value = []
+        nextTick(() => {
+          cardDefaultRef.value?.close()
+        })
+      }
+    },
+  });
+}
 // form表单数据
 let ruleForm = ref<any>({
   exp: 0,
@@ -194,8 +326,7 @@ let ruleForm = ref<any>({
   certType: '',
   levelId: ''
 })
-const antysList= ref<any>(Object.entries(antys).map(([id, name]) => ({id, name})))
+
-const cardTypeList = ref<any>(Object.entries(psnCertTypes).map(([id, name]) => ({id, name})))
 const options1 = [
   {
     value: '员工推荐',
@@ -246,13 +377,13 @@ const rules = ref<any>({
     {required: true, message: '手机号不能为空', trigger: 'blur'}
   ],
   sex: [
-    { required: true, message: '性别不能为空', trigger: 'change' }
+    {required: true, message: '性别不能为空', trigger: 'blur'}
   ],
   birthday: [
     {required: true, message: '请选择生日', trigger: 'change'}
   ],
   certType: [
-    { required: true, message: '请选择证件类型', trigger: 'change' }
+    {required: true, message: '请选择证件类型', trigger: 'blur'}
   ],
   certNo: [
     {required: true, message: '请输入证件号', trigger: 'blur'}
@@ -287,7 +418,6 @@ const levelList = ref<any>([])
 const getLevelConfig = () => {
   post("vip/vipLevel/list").then((res: any) => {
     levelList.value = res
-    console.log('le',levelList.value)
   })
 }
 onMounted(() => {
@@ -309,8 +439,66 @@ defineExpose({init})
 .bottom {
   height: 100%;
   display: flex;
-  justify-content: flex-end;
+  justify-content: space-between;
-  padding: 20px;
   align-items: center;
+  padding: 0 24px;
+}
+
+.btnCard {
+  width: 150px;
+  height: 36px;
+  background: #FFFFFF;
+  border-radius: 8px;
+  border: 1px solid #4D6DE4;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-weight: 400;
+  font-size: 15px;
+  color: #4D6DE4;
+  font-style: normal;
+
+  .image {
+    width: 20px;
+    height: 17px;
+    margin-right: 6px;
+  }
+
+  .image1 {
+    width: 12px;
+    height: 6px;
+    margin-left: 16px;
+  }
+
+  &:hover {
+    cursor: pointer;
+    border: 1px solid #4D6DE4;
+  }
+}
+
+.closeBtn {
+  width: 150px;
+  height: 36px;
+  background: #FFFFFF;
+  border-radius: 8px;
+  border: 1px solid #4D6DE4;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-weight: 400;
+  font-size: 15px;
+  color: #4D6DE4;
+  font-style: normal;
+
+  .image {
+    width: 20px;
+    height: 17px;
+    margin-right: 6px;
+  }
+
+  &:hover {
+    cursor: pointer;
+    border: 1px solid #4D6DE4;
+  }
 }
 </style>

src/components/outpatient/DiagnosisSearchInput.vue

@@ -2,7 +2,8 @@
   <el-popover placement="bottom-start" :visible="isVisible" :width="props.width" ref="popoverRef"
               @before-enter="beforeShow" @hide="afterShow" popper-class="type-popper">
     <template #reference>
-      <el-input v-model="keyword" style="width: 100%;height: 100%" @input="changeInput" :disabled="disabled" @click="changeInput"
+      <el-input v-model="keyword" style="width: 100%;height: 100%" @input="changeInput" :disabled="disabled"
+                @click="changeInput"
                 placeholder="诊断选择" ref="inputRef" @focus="focus" @blur="handleBlur"></el-input>
     </template>
     <div class="container" style="height: 300px">
@@ -118,16 +119,18 @@ const clickRow = (row: any) => {
     })
     return
   }
-  if (selectList.value.some((item: any) => item.id === row.id)) {
+
+  if (selectList.value.some((item: any) => item.id == row.id)) {
     ElMessage({
       message: '诊断已存在',
       type: 'info',
     })
-    return
+  } else {
-  }
     selectList.value.push(row)
     nameList.value.push(row.name)
     keyword.value = nameList.value.join(",") + ","
+  }
+
   searchList.value = []
   popoverRef.value.hide()
 }
@@ -175,6 +178,7 @@ defineExpose({init,clear})
 :deep(.el-table--small .el-table__cell) {
   padding: 0;
 }
+
 .table {
   th {
     background: none !important;
@@ -189,6 +193,7 @@ defineExpose({init,clear})
 
     th {
       text-align: left;
+
       &:nth-child(1) {
         text-align: left;
         border-radius: 8px 8px 0 0;
@@ -203,6 +208,7 @@ defineExpose({init,clear})
     font-size: 14px;
     color: #666666;
     font-style: normal;
+
     td {
       &:nth-child(1) {
 
@@ -215,7 +221,6 @@ defineExpose({init,clear})
     }
 
 
-
     &:last-child {
       border-radius: 0 0 8px 8px;
     }

src/components/outpatient/MedicalQueue.vue

@@ -118,7 +118,7 @@ const init = async () => {
     list.value = data.list
     if (itemId.value != null) {
       list.value.forEach((item: any, index: any) => {
-        if (item.id == itemId.value) {
+        if (item.id == itemId.value&&curStatus.value == 2) {
           clickLi(item, false)
         }
       })

src/components/registration/Edit.vue

@@ -149,7 +149,6 @@
       </div>
 
     </template>
-
     <template #footer>
       <div class="bottom">
         <el-dropdown v-if="isShowCard" placement="top-start" @show="showCardBtn" @hide="hide"
@@ -385,7 +384,6 @@ const getSectionList = () => {
 const loading = ref(false)
 const changeLoading = (e: any) => {
   loading.value = e
-  console.log(e,'e')
 }
 defineExpose({init})
 </script>

src/views/charge/index.vue

@@ -112,7 +112,6 @@ const delDraft = () => {
 }
 const settlementRef = ref()
 const charge = () => {
-
   if (checkTraceCode(formData.value.goodsDetail)) {
     //保存订单
     saveAndCharge()

src/views/outpatient/index.vue

@@ -107,14 +107,14 @@ const save = () => {
 const totalAmount = ref(0)
 const medicalHistoryRef = ref()
 const patientCardRef = ref()
-const patientRegistration = ref<any>({})
+const patientRegistration = ref<any>({})//  当前挂号信息
 const clickItem = (item: any) => {
-  curRegister.value = item
   if (!item) return
+  curRegister.value = item
   registerId.value = item.id
   itemId.value = item.id
   patientId.value = item.patientInfoId
-  if (item.status == 2) {
+  if (item.status == 1) {
     initFormData()
   }
   if (item.status == 3) {