lighter 3 роки тому
батько
коміт
a1fabdfde2

+ 13 - 1
src/App.vue

@@ -81,7 +81,7 @@ function getWindowSize() {
 }
 </script>
 
-<style>
+<style lang="scss">
 html,
 body,
 #app {
@@ -285,4 +285,16 @@ table th.star div::before {
   background-color: #fac44d;
   color: white;
 }
+
+.el-message {
+  border: none;
+  border-radius: 2px;
+  background-color: white;
+  padding: 10px 16px;
+  box-shadow: 1px 3px 8px 4px rgb(0 0 0 / 10%);
+  .el-message__content {
+    color: #333333;
+  }
+}
+
 </style>

+ 5 - 5
src/utils/validate.js

@@ -9,7 +9,7 @@ export function nullPatient() {
         ElMessage({
             message: '请先选择患者!',
             type: 'warning',
-            duration: 2500,
+            duration: 2600,
             showClose: true,
         })
         return true
@@ -118,8 +118,8 @@ function isValidIdcard(card) {
         card = changeFivteenToEighteen(card)
         const len = card.length
         if (len === 18) {
-            const arrInt = new Array(7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2)
-            const arrCh = new Array('1', '0', 'X', '9', '8', '7', '6', '5', '4', '3', '2')
+            const arrInt = [7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2]
+            const arrCh = ['1', '0', 'X', '9', '8', '7', '6', '5', '4', '3', '2']
             var cardTemp = 0,
                 i,
                 valnum
@@ -135,8 +135,8 @@ function isValidIdcard(card) {
     //15位转18位身份证号
     const changeFivteenToEighteen = function (card) {
         if (card.length === 15) {
-            const arrInt = new Array(7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2)
-            const arrCh = new Array('1', '0', 'X', '9', '8', '7', '6', '5', '4', '3', '2')
+            const arrInt = [7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2]
+            const arrCh = ['1', '0', 'X', '9', '8', '7', '6', '5', '4', '3', '2']
             var cardTemp = 0,
                 i
             card = card.substr(0, 6) + '19' + card.substr(6, card.length - 6)

+ 75 - 89
src/views/medical-insurance/inpatient/AdmRegistration.vue

@@ -35,9 +35,8 @@
         </el-descriptions-item>
         <el-descriptions-item>
           <template #label> 入院诊断</template>
-          <div style="width: 180px" class="ellipsis-text" :title="patient.admissDiagStr">{{
-              patient.admissDiagStr
-            }}
+          <div style="width: 180px" class="ellipsis-text" :title="patient.admissDiagStr">
+            {{ patient.admissDiagStr }}
           </div>
         </el-descriptions-item>
         <el-descriptions-item>
@@ -78,7 +77,7 @@
         </el-descriptions-item>
         <el-descriptions-item>
           <template #label> 国籍</template>
-          <el-select v-model="patient.country" style="width: 180px" filterable>
+          <el-select v-model="patient.country" style="width: 180px" :filterable="true">
             <el-option v-for="item in countries" :key="item.code" :label="item.name" :value="item.code">
               <span style="color: #8492a6; font-size: 12px">{{ item.code }}</span>
               <el-divider direction="vertical"></el-divider>
@@ -88,7 +87,7 @@
         </el-descriptions-item>
         <el-descriptions-item>
           <template #label> 民族</template>
-          <el-select v-model="patient.nation" style="width: 180px" filterable>
+          <el-select v-model="patient.nation" style="width: 180px" :filterable="true">
             <el-option v-for="item in nations" :key="item.code" :label="item.name" :value="item.code">
               <span style="color: #8492a6; font-size: 12px">{{ item.code }}</span>
               <el-divider direction="vertical"></el-divider>
@@ -102,7 +101,7 @@
         </el-descriptions-item>
         <el-descriptions-item>
           <template #label> 联系人关系</template>
-          <el-select v-model="patient.contactRelation" style="width: 180px" filterable>
+          <el-select v-model="patient.contactRelation" style="width: 180px" :filterable="true">
             <el-option v-for="item in relations" :key="item.code" :label="item.name" :value="item.code">
               <span style="color: #8492a6; font-size: 12px">{{ item.code }}</span>
               <el-divider direction="vertical"></el-divider>
@@ -120,7 +119,8 @@
         </el-descriptions-item>
         <el-descriptions-item>
           <template #label> 登记日期</template>
-          <el-date-picker v-model="patient.ybRegisterDate" placeholder="选择日期时间" style="width: 180px" type="datetime"
+          <el-date-picker v-model="patient.ybRegisterDate" placeholder="选择日期时间" style="width: 180px"
+                          type="datetime"
                           @change="formatYbRegisterDate"></el-date-picker>
         </el-descriptions-item>
         <el-descriptions-item>
@@ -132,7 +132,7 @@
               <span>{{ item.name }}</span>
             </el-option>
           </el-select>
-          <el-select v-else v-model="patient.admdvs" clearable filterable placeholder="请选择" style="width: 180px">
+          <el-select v-else v-model="patient.admdvs" :clearable="true" :filterable="true" placeholder="请选择" style="width: 180px">
             <el-option v-for="item in admdvs" :key="item.code" :label="item.name" :value="item.code">
               <span style="color: #8492a6; font-size: 12px">{{ item.code }}</span>
               <el-divider direction="vertical"></el-divider>
@@ -142,7 +142,7 @@
         </el-descriptions-item>
         <el-descriptions-item>
           <template #label> 医疗类别</template>
-          <el-select v-model="patient.medType" clearable placeholder="请选择" @change="handleSelectMedType"
+          <el-select v-model="patient.medType" :clearable="true" placeholder="请选择" @change="handleSelectMedType"
                      style="width: 180px">
             <el-option v-for="item in medTypes" :key="item.code" :disabled="item.disabled" :label="item.name"
                        :value="item.code">
@@ -241,7 +241,7 @@
           :current-page="currentPage"
           :page-size="10"
           :total="cptSpecialDiags.length"
-          layout="total, prev, pager, next, jumper"
+          :layout="'total, prev, pager, next, jumper'"
           style="margin-top: 5px"
           @current-change="handleCurrentChange"
       ></el-pagination>
@@ -250,7 +250,8 @@
     <el-dialog v-model="showAdmissApplyForm" title="医保入院登记申请" width="500px">
       <div style="margin-bottom: 20px">
         登记时间:
-        <el-date-picker v-model="admissApply.admissDatetime" placeholder="请选择医保登记开始时间" type="datetime"></el-date-picker>
+        <el-date-picker v-model="admissApply.admissDatetime" placeholder="请选择医保登记开始时间"
+                        type="datetime"></el-date-picker>
       </div>
       <el-input v-model="admissApply.inputComment" placeholder="请输入申请理由" type="textarea"></el-input>
       <div style="width: 450px; text-align: right; margin-top: 30px">
@@ -431,10 +432,10 @@ export default {
     }
 
     const openDiseInput = () => {
-        getAllSpecialDiags(patient.value.medType).then((res) => {
-          specialDiags.value = res
-          showSearchSpecialDiag.value = true
-        })
+      getAllSpecialDiags(patient.value.medType).then((res) => {
+        specialDiags.value = res
+        showSearchSpecialDiag.value = true
+      })
     };
 
     const addDiseInfo = (row) => {
@@ -463,15 +464,6 @@ export default {
     }
 
     const saveYbDiags = () => {
-      if (patient.value.medType === '52' && !patient.value.matnType) {
-        ElMessage({
-          message: '请选择生育类别!',
-          type: 'warning',
-          duration: 2500,
-          showClose: true,
-        })
-        return
-      }
       const param = {
         inpatientNo: patient.value.inpatientNo,
         admissTimes: patient.value.admissTimes,
@@ -702,24 +694,22 @@ export default {
         type: 'warning',
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-      })
-          .then(() => {
-            const param = {
-              baseinfo: patient.value,
-              injuryinfo: row,
-            }
-            admissRegistration(param).then((res) => {
-              ElMessage({
-                message: '审核已通过,医保入院登记成功。',
-                type: 'success',
-                duration: 2500,
-                showClose: true,
-              })
-              showPsnInsuinfo.value = false
-            })
-          })
-          .catch(() => {
+      }).then(() => {
+        const param = {
+          baseinfo: patient.value,
+          injuryinfo: row,
+        }
+        admissRegistration(param).then((res) => {
+          ElMessage({
+            message: '审核已通过,医保入院登记成功。',
+            type: 'success',
+            duration: 2500,
+            showClose: true,
           })
+          showPsnInsuinfo.value = false
+        })
+      }).catch(() => {
+      })
     }
 
     const handleClickInsuinfo = (row) => {
@@ -727,25 +717,23 @@ export default {
         type: 'warning',
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-      })
-          .then(() => {
-            patient.value.balc = row.balc
-            patient.value.insutype = row.insutype
-            patient.value.psnType = row.psnType
-            patient.value.insuplcAdmdvs = row.insuplcAdmdvs
-            patient.value.empName = row.empName
-            admissRegister(patient.value).then(() => {
-              ElMessage({
-                message: '医保入院登记成功。',
-                type: 'success',
-                duration: 2500,
-                showClose: true,
-              })
-              showPsnInsuinfo.value = false
-            })
-          })
-          .catch(() => {
+      }).then(() => {
+        patient.value.balc = row.balc
+        patient.value.insutype = row.insutype
+        patient.value.psnType = row.psnType
+        patient.value.insuplcAdmdvs = row.insuplcAdmdvs
+        patient.value.empName = row.empName
+        admissRegister(patient.value).then(() => {
+          ElMessage({
+            message: '医保入院登记成功。',
+            type: 'success',
+            duration: 2500,
+            showClose: true,
           })
+          showPsnInsuinfo.value = false
+        })
+      }).catch(() => {
+      })
     }
 
     const beforeCancelRegister = () => {
@@ -753,38 +741,36 @@ export default {
       ElMessageBox.prompt('请输入撤销入院登记的原因:', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-      })
-          .then(({value}) => {
-            if (!value) {
-              ElMessage({
-                message: '撤销入院登记的原因不能为空!',
-                type: 'warning',
-                duration: 2500,
-                showClose: true,
+      }).then(({value}) => {
+        if (!value) {
+          ElMessage({
+            message: '撤销入院登记的原因不能为空!',
+            type: 'warning',
+            duration: 2500,
+            showClose: true,
+          })
+          return
+        }
+        ElMessageBox.confirm('撤销医保入院登记的原因为【' + value + '】确定撤销?', '提示', {
+          type: 'warning',
+        }).then(() => {
+          patient.value.revokeRemark = value
+          if (injuryMode.value) {
+            cancelInjuryRegister(patient.value).then(() => {
+              ElMessageBox.alert('撤销入院登记成功。', '提示', {
+                type: 'success',
               })
-              return
-            }
-            ElMessageBox.confirm('撤销医保入院登记的原因为【' + value + '】确定撤销?', '提示', {
-              type: 'warning',
-            }).then(() => {
-              patient.value.revokeRemark = value
-              if (injuryMode.value) {
-                cancelInjuryRegister(patient.value).then(() => {
-                  ElMessageBox.alert('撤销入院登记成功。', '提示', {
-                    type: 'success',
-                  })
-                })
-              } else {
-                revokeAdmission(patient.value).then(() => {
-                  ElMessageBox.alert('撤销入院登记成功。', '提示', {
-                    type: 'success',
-                  })
-                })
-              }
             })
-          })
-          .catch(() => {
-          })
+          } else {
+            revokeAdmission(patient.value).then(() => {
+              ElMessageBox.alert('撤销入院登记成功。', '提示', {
+                type: 'success',
+              })
+            })
+          }
+        })
+      }).catch(() => {
+      })
     }
 
     const showAssigninfo = ref(false)