yeguodong hace 2 meses
padre
commit
14cb1245c7

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

@@ -254,12 +254,12 @@
       @closed="yzDialogRef = false"
     />
       <!--  选择医嘱后弹窗  -->
-      <showDialog
+<!--      <showDialog
         v-if="showDialogRef"
         :yz-data="yiZhuData"
         @select="handlePaymentSelect"
         @closed="showDialogRef = false"
-      />
+      />-->
   </div>
 </template>
 
@@ -1022,9 +1022,9 @@ const confirmOrdersClick = async () => {
 const yzDialogRef = ref(false);
 const showDialogRef = ref(false);
 const openTheOrderPopUpWindow = () => {
-  showDialogRef.value=true;
+  // showDialogRef.value=true;
       //让CyComboGrid 失焦,否则医嘱名称会2次弹窗
-     if (orderCodeRef.value && typeof orderCodeRef.value.blur === 'function') {
+     /*if (orderCodeRef.value && typeof orderCodeRef.value.blur === 'function') {
        orderCodeRef.value.blur();
      } else {
        const comboGridEl = orderCodeRef.value?.$el;
@@ -1032,7 +1032,7 @@ const openTheOrderPopUpWindow = () => {
          const inputEl = comboGridEl.querySelector('input'); // 找到内部输入框
          if (inputEl) inputEl.blur();
        }
-    }
+    }*/
     //如果下面也会弹窗的话,那么我们就要下面就要做判断了,因为我没有碰到所以我暂时就没写了
   if (!isEdit.value) {
     if (yiZhuData.value.statusFlag !== "1") {
@@ -1260,14 +1260,14 @@ defineExpose({
 });
 
 // showDialog
-const handlePaymentSelect = (type) => {
+/*const handlePaymentSelect = (type) => {
   if (type === 'self') {
     // 选择自费时,勾选复选框
     yiZhuData.value.ybSelfFlag = "1";
   }else{
      yiZhuData.value.ybSelfFlag = "0";
   }
-};
+};*/
 </script>
 
 <style scoped lang="scss">

+ 2 - 1
src/utils/portrait.js

@@ -14,7 +14,8 @@ export function genTextPortrait(name) {
   ctx.textBaseline = 'middle'
   ctx.textAlign = 'center'
   ctx.fillText(name, 50, 50)
-  return cvs.toDataURL('image/png', 1)
+  return cvs.toDataURL('image/png', 1);
+  // return null;
 }
 
 function transColor(name) {

+ 1 - 0
src/utils/websocket.ts

@@ -32,6 +32,7 @@ export function initWebSocket() {
   const userStore = useUserStore().userInfo;
 
   const url = `${env.VITE_SOCKET_V2}/intergrationPlatform/${userStore.code}`;
+  // const url = `ws://130.150.161.72:20922/websocket/intergrationPlatform/${userStore.code}`;
 
   webSocket = useCySocket(url, {
     setInfo: false,

+ 2 - 2
src/views/medical-advice/advice-management/CqYzPrint.vue

@@ -181,8 +181,8 @@ const companyFunc = (val, company) => {
 };
 
 const getSign = (code) => {
-    return env.RESOURCE_BASE_URL + "/doctorSignatureImage/" + code + ".png";
-    // return "http://130.150.161.72:8080" + "/doctorSignatureImage/" + code + ".png";
+    // return env.RESOURCE_BASE_URL + "/doctorSignatureImage/" + code + ".png";
+    return "http://130.150.161.72:8080" + "/doctorSignatureImage/" + code + ".png";
 }
 
 const yzOrderParam = ref({

+ 3 - 3
src/views/medical-advice/advice-management/LsYzPrint.vue

@@ -114,7 +114,7 @@
                         >
                             第{{ item.printPageOnce }}页
                         </td>
-                        <td v-if="item.pageFlag != '1'" style="height: 40px">
+                        <td v-if="item.pageFlag != '1'" style="height: 41px">
                             {{ item.date }}
                         </td>
                         <td v-if="item.pageFlag != '1'">{{ item.time }}</td>
@@ -180,8 +180,8 @@ const yzOrderParam = ref({
 const pageNumList = ref([]);
 
 const getSign = (code) => {
-    return env.RESOURCE_BASE_URL + "/doctorSignatureImage/" + code + ".png";
-    // return "http://130.150.161.72:8080" + "/doctorSignatureImage/" + code + ".png";
+    // return env.RESOURCE_BASE_URL + "/doctorSignatureImage/" + code + ".png";
+    return "http://130.150.161.72:8080" + "/doctorSignatureImage/" + code + ".png";
 }
 
 //