浏览代码

下拉框替换

xiaochan 2 年之前
父节点
当前提交
061becf835

+ 6 - 4
src/components/xiao-chan/combo-grid/XcComboGridV2.vue

@@ -164,6 +164,7 @@ const rowClick = (val) => {
   if (props.select) {
     modVal.value = row.code
     selectName = row.name
+    inputData.value = row.name
   } else {
     if (isObj) {
       props.modelValue[modCode] = row.code
@@ -191,6 +192,7 @@ const inputClick = async () => {
   } else {
     await vxeTableRef.value.scrollTo(0, scrollTopRecording)
   }
+  handleFocus()
 }
 
 const handleFocus = () => {
@@ -315,7 +317,6 @@ onMounted(async () => {
     watch(() => props.modelValue[modCode], () => {
       inputData.value = props.modelValue[modName]
     }, {immediate: true, deep: true});
-
   } else {
     watch(() => props.modelValue, () => {
       if (props.select) {
@@ -331,10 +332,11 @@ onMounted(async () => {
         if (data) {
           inputData.value = data.name
         } else {
-          inputData.value = <string>modVal.value
-          selectName = ''
+          if (!pullDownRef.value.isPanelVisible()) {
+            inputData.value = <string>modVal.value
+            selectName = ''
+          }
         }
-
       } else {
         inputData.value = <string>props.modelValue;
       }

+ 13 - 6
src/views/hospitalization/zhu-yuan-yi-sheng/jian-cha-jian-yan-shen-qing/components/public/JianChaJianYanTable.vue

@@ -11,6 +11,7 @@ import {
 import XcSelectV3 from "@/components/xiao-chan/select-v3/XcSelectV3.vue";
 import {computed} from "vue";
 import store from "@/store";
+import XcComboGridV2 from "@/components/xiao-chan/combo-grid/XcComboGridV2.vue";
 
 const {data, isCheck, publicData} = defineProps({
   data: {
@@ -149,12 +150,18 @@ onMounted(() => {
       <el-col :span="12">
         临床诊断:
         <br>
-        <xc-select-v3
-            v-model="publicData"
-            :data="linChuangZhenDuanShuJu"
-            :remote-method="linChuangZhenDuanSuoSou"
-            code="diagCode"
-            name="diagText"/>
+        <XcComboGridV2
+          v-model="publicData.diagCode"
+          select
+          v-model:data="linChuangZhenDuanShuJu"
+          :query-data-func="diagnosisInOurHospital"
+        />
+<!--        <xc-select-v3-->
+        <!--            v-model="publicData"-->
+        <!--            :data="linChuangZhenDuanShuJu"-->
+        <!--            :remote-method="linChuangZhenDuanSuoSou"-->
+        <!--            code="diagCode"-->
+        <!--            name="diagText"/>-->
       </el-col>
 
     </el-row>