Merge remote-tracking branch 'upstream/master'

src/views/hospitalization/case-front-sheet/FillCaseFrontSheet.vue

@@ -65,7 +65,7 @@
                   <option v-for="(item, index) in dics.getSexCode" :key="index" :value="item.code">&nbsp;&nbsp;{{ item.name }}&nbsp;&nbsp;</option>
                 </select>
                 出生日期: <input id="birthDate" v-model="patient.birthDate" style="width: 130px" /> 年龄:
-                <input id="age" v-model="patient.age" style="width: 30px" />
+                <input id="age" v-model="patient.age" type="number" style="width: 30px" />
                 国籍:
                 <select id="country" v-model="patient.country">
                   <option v-for="(item, index) in dics.getCountry" :key="index" :value="item.code">&nbsp;&nbsp;{{ item.name }}&nbsp;&nbsp;</option>
@@ -74,8 +74,8 @@
               <div>
                 （年龄不足 1 周岁的）年龄:
                 <input id="ageDays" type="number" v-model="patient.ageDays" style="width: 50px" />天 新生儿出生体重:
-                <input id="newBornWeight" v-model="patient.newBornWeight" style="width: 70px" />克 新生儿入院体重:
-                <input id="newBornAdmissWeight" v-model="patient.newBornAdmissWeight" style="width: 70px" />克
+                <input id="newBornWeight" type="number" v-model="patient.newBornWeight" style="width: 70px" />克 新生儿入院体重:
+                <input id="newBornAdmissWeight" type="number" v-model="patient.newBornAdmissWeight" style="width: 70px" />克
               </div>
               <div>
                 出生地:
@@ -264,6 +264,7 @@
                 <input id="hurtReasonName" v-model="patient.hurtReasonName" style="width: 300px" @click="showSearchData('hurt')" />
                 疾病编码:
                 <input id="hurtReasonCode" v-model="patient.hurtReasonCode" style="width: 110px" readonly />
+                &nbsp;&nbsp;<el-button type="danger" circle icon="Delete" @click="clearLine('hurtReason')"></el-button>
               </div>
               <div>
                 病理诊断:
@@ -271,6 +272,7 @@
                 病理编码:
                 <input id="pathologicDiagCode" v-model="patient.pathologicDiagCode" style="width: 90px" readonly />
                 病理号: <input id="blh" v-model="patient.blh" style="width: 70px" />
+                &nbsp;&nbsp;<el-button type="danger" circle icon="Delete" @click="clearLine('pathologicDiag')"></el-button>
               </div>
               <div>
                 药物过敏:
@@ -773,7 +775,7 @@
 <script setup name="FillCaseFrontSheet">
 import { yesOrNo, haveOrNot, searchMethods, autopsies, initShowDel, filterDismissStatus, clone } from './common'
 import store from '@/store'
-import { operations } from '@/data/index'
+import { operations } from '@/data'
 import { initLodop, getLodop } from '@/utils/c-lodop'
 import {
   doSaveYbDiags,
@@ -1200,6 +1202,20 @@ const handleSelectSearch = (item) => {
   showSearch.value = false
 }
 
+const clearLine = (option) => {
+  switch (option) {
+    case 'hurtReason':
+      patient.value.hurtReasonName = null
+      patient.value.hurtReasonCode = null
+      break;
+    case 'pathologicDiag':
+      patient.value.pathologicDiagStr = null
+      patient.value.pathologicDiagCode = null
+      patient.value.blh = null
+      break;
+  }
+}
+
 const ybDiags = ref([])
 const addToYbDiags = () => {
   if (!ybDiag.siDiagType) {

src/views/hospitalization/case-front-sheet/common.js

@@ -1,14 +1,14 @@
 import { ref } from '@vue/reactivity'
 
 export const yesOrNo = [
+  { code: '', name: '' },
   { code: '1', name: '是' },
   { code: '2', name: '否' },
-  { code: '-', name: '-' },
 ]
 export const haveOrNot = [
+  { code: '', name: '' },
   { code: '1', name: '无' },
   { code: '2', name: '有' },
-  { code: '-', name: '-' },
 ]
 export const searchMethods = [
   { code: 'alpha', name: '拼音' },
@@ -16,9 +16,9 @@ export const searchMethods = [
   { code: 'name', name: '名称' },
 ]
 export const autopsies = [
+  { code: '', name: '' },
   { code: '1', name: '是' },
   { code: '2', name: '否' },
-  { code: '', name: '-' },
 ]
 export function initShowDel() {
   return ref([