住院医生

src/components/zhu-yuan-yi-sheng/yi-zhu-lu-ru/table/YzTable.vue

@@ -42,7 +42,7 @@
                          @click.stop="setDefaultStopTime(item)">
                 </div>
                 <div v-else-if="heindex === 20">
-                  <button @click.stop="props.voidOrders(item)">撤销</button>
+                  <button @click.stop="props.voidOrders(item)">作废</button>
                 </div>
                 <div v-else-if="he.func" v-html="he.func(item,startIndex + index)"/>
                 <div v-else>

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

@@ -513,6 +513,11 @@ const fuYiZhuClick = async () => {
 }
 
 const modifyDosingMethod = () => {
+  if (yiZhuData.value.parentNo == yiZhuData.value.actOrderNo) {
+    yiZhuData.value.parentNo = ''
+    BizException(ExceptionEnum.MESSAGE_ERROR,'不能选中自己')
+  }
+
   if (yiZhuData.value.parentNo) {
     yiZhuData.value.supplyCode = '044'
     yiZhuData.value.supplyCodeName = '副药'

src/views/hospitalization/zhu-yuan-yi-sheng/XinZengShuJu.vue

@@ -4,7 +4,6 @@
     <tian-jia-jian-cha-jian-yan v-else-if="name === '检验' || name === '检查'"
                                 :jian-cha="name === '检查'">
     </tian-jia-jian-cha-jian-yan>
-    <xin-zeng-shou-shu-shen-qing v-if="name === '手术'"></xin-zeng-shou-shu-shen-qing>
     <xin-zhen-cao-yao v-if="name === '草药'"></xin-zhen-cao-yao>
   </div>
 </template>

src/views/hospitalization/zhu-yuan-yi-sheng/public-js/zhu-yuan-yi-sheng.js

@@ -55,7 +55,7 @@ export function shouShuDengJi(val) {
 }
 
 export let zkList = ref([])
-let isDev = import.meta.env.VITE_BASE_URL === 'http://172.16.30.3:8706'
+let isDev = import.meta.env.VITE_BASE_URL !== 'http://172.16.32.160:8706'
 // 医嘱查询条件
 export const queryParam = ref({
     displayRange: 0,

src/views/hospitalization/zhu-yuan-yi-sheng/yi-zhu-lu-ru/TianJiaYiZhu.vue

@@ -367,6 +367,8 @@ import XcComboGrid from "@/components/xiao-chan/combo-grid/XcComboGrid";
 import XcSelect from "@/components/xiao-chan/select/XcSelect";
 import XcOption from "@/components/xiao-chan/select/XcOption";
 import XcCode from "@/components/xiao-chan/code/XcCode";
+import XcTableColumn from "@/components/xiao-chan/select-v3/XcTableColumn";
+import XcSelectV3 from "@/components/xiao-chan/select-v3/XcSelectV3";
 
 const props = defineProps({
   patientInfo: {