修复bug

src/components/input-table-query/InputAndTable.vue

@@ -49,6 +49,7 @@
 <script name="InputAndTable" setup>
 import { stringNotBlank } from '@/utils/blank-utils'
 import { debounce } from '@/utils/debounce'
+import XcCode from "@/components/xiao-chan/code/XcCode.vue";
 
 const props = defineProps({
   modelValue: {

src/components/xiao-chan/combo-grid/XcComboGridV2.vue

@@ -4,6 +4,7 @@ import XEUtils from 'xe-utils'
 import {PulldownMethods} from "vxe-table/types/pulldown";
 import {useVModel} from "@vueuse/core";
 import {VxeTableInstance} from "vxe-table";
+import {$ref} from "vue/macros";
 
 const props = defineProps({
   modelValue: {
@@ -27,7 +28,7 @@ const props = defineProps({
   },
   code: String,
   name: String,
-  // 绑定对象的 code 自动在拼接name在字段的后面
+  // 绑定对象的 code 自动在后面 拼接 Name
   codeName: String,
   clearable: {
     type: Boolean,
@@ -68,8 +69,9 @@ const emits = defineEmits([
 const modVal = useVModel(props, 'modelValue', emits)
 const modData = useVModel(props, 'data', emits)
 
-let modCode = ''
-let modName = ''
+let modCode = $ref('')
+let modName = $ref('')
+
 let selectName = ''
 let scrollTopRecording = 0
 
@@ -289,16 +291,7 @@ const handleClear = () => {
 
 const scroll = (val) => {
   let {
-    type,
     scrollTop,
-    scrollLeft,
-    scrollHeight,
-    scrollWidth,
-    bodyWidth,
-    bodyHeight,
-    isX,
-    isY,
-    $event
   } = val;
   scrollTopRecording = scrollTop;
 }
@@ -313,7 +306,10 @@ onMounted(async () => {
       modName = props.codeName + 'Name';
     } else {
       if (!props.code || !props.name) {
-        console.error('绑定是对象，要填写 code 和 name');
+        console.error('绑定是对象，要填写 code 和 name 或者填写codeName');
+      } else {
+        modCode = props.code
+        modName = props.name
       }
     }
 
@@ -364,7 +360,7 @@ onMounted(async () => {
       transfer>
     <template #default>
       <el-input v-model="inputData"
-                :title="isObj ? props.modelValue[props.name] : props.modelValue"
+                :title="isObj ? props.modelValue[modName] : props.modelValue"
                 @clear="handleClear"
                 :disabled="props.disabled"
                 ref="inputRef"

src/components/zhu-yuan-yi-sheng/shou-shu-shen-qing/BianJiShouShu.vue

@@ -98,15 +98,13 @@
                             @row-click="buildOrderName"
                             filterable
                             :data="props.anestheticMode"
-                            code="hocusCode"
-                            name="hocusCodeName"/>
+                            code-name="hocusCode"/>
         </el-form-item>
       </el-col>
       <el-col :span="12">
         <el-form-item label="主刀医生" prop="doctorZd">
           <xc-combo-grid-v2 v-model="props.data"
-                            code="doctorZd"
-                            name="doctorZdName"
+                            code-name="doctorZd"
                             filterable
                             :table-header="personnel"
                             :data="props.personnelList"/>
@@ -124,7 +122,7 @@
       <el-col :span="12">
         <el-form-item label="第二助手">
           <xc-combo-grid-v2 v-model="props.data"
-                            code="doctor2" name="doctor2Name"
+                            code-name="doctor2"
                             filterable
                             :table-header="personnel"
                             :data="props.personnelList"/>
@@ -133,7 +131,7 @@
       <el-col :span="12">
         <el-form-item label="第三助手">
           <xc-combo-grid-v2 v-model="props.data"
-                            code="doctor3" name="doctor3Name"
+                            code-name="doctor3"
                             filterable
                             :table-header="personnel"
                             :data="props.personnelList"/>
@@ -142,7 +140,7 @@
       <el-col :span="12">
         <el-form-item label="麻醉医生">
           <xc-combo-grid-v2 v-model="props.data"
-                            code="doctorMz" name="doctorMzName"
+                            code-name="doctorMz"
                             filterable
                             :table-header="personnel"
                             :data="props.personnelList"/>
@@ -151,7 +149,7 @@
       <el-col :span="12">
         <el-form-item label="器械护士">
           <xc-combo-grid-v2 v-model="props.data"
-                            code="nurseQx" name="nurseQxName"
+                            code-name="nurseQx"
                             filterable
                             :table-header="personnel"
                             :data="props.personnelList"/>
@@ -160,7 +158,7 @@
       <el-col :span="12">
         <el-form-item label="巡回护士">
           <xc-combo-grid-v2 v-model="props.data"
-                            code="nurseXh" name="nurseXhName"
+                            code-name="nurseXh"
                             filterable
                             :table-header="personnel"
                             :data="props.personnelList"/>

src/components/zhu-yuan-yi-sheng/yi-zhu-lu-ru/yz-edit/YzEditor.vue

@@ -645,7 +645,7 @@ const toAddAnOrder = async () => {
   }
   try {
     let res = await enterOrders(param)
-    if (res !== null && res.error) {
+    if (res && res.error) {
       baoCunXinXiRef.value.openOrClose()
       errorMessageData.value = res.data
       return false
@@ -808,7 +808,6 @@ const copyFuncApi = async () => {
     temp[item] = true
   })
   yzData.value.push(...data)
-  // 查询医嘱
   yzMitt.emit('scrollEndAndTwinkle', temp)
   copyOrderNo.actOrderNo = null
 }

src/views/settings/Test.vue

@@ -8,6 +8,7 @@
 
   <el-button @click="测试('04.0412')">测试1</el-button>
   <el-button @click="测试('11')">测试2</el-button>
+
 </template>
 
 <script setup>