From acc33467da8dbaf4c15fb1d2e4cadd63696de5b4 Mon Sep 17 00:00:00 2001
From: lq <workerqi@163.com>
Date: Fri, 30 May 2025 16:56:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=96=B0=E5=A2=9E=E8=8D=AF=E5=B8=88?=
 =?UTF-8?q?=E3=80=81=E7=BC=96=E8=BE=91=E8=8D=AF=E5=B8=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/PrescriptionDetail.vue         | 28 +++++++------
 .../src/views/doctor/pharmacist/api/index.ts  |  8 ++++
 .../doctor/pharmacist/components/modal.vue    | 39 +++++++++++--------
 .../views/doctor/pharmacist/config/form.ts    | 22 +++++++++++
 .../src/views/doctor/pharmacist/index.vue     |  8 ++++
 5 files changed, 73 insertions(+), 32 deletions(-)

diff --git a/apps/web-antd/src/views/doctor/doctor-reception/components/PrescriptionDetail.vue b/apps/web-antd/src/views/doctor/doctor-reception/components/PrescriptionDetail.vue
index 788bede0..c32ac8fd 100644
--- a/apps/web-antd/src/views/doctor/doctor-reception/components/PrescriptionDetail.vue
+++ b/apps/web-antd/src/views/doctor/doctor-reception/components/PrescriptionDetail.vue
@@ -92,6 +92,14 @@ function handleWindowPrint(ele, fileName) {
 
 // 解密方法示例（需要根据实际加密方式实现）
 const decrypt = (str: string) => str; // 简单base64解码示例
+
+const getImageSource = (imageString) => {
+  if (imageString && imageString.includes('http')) {
+    return imageString; // 直接使用HTTP URL
+  } else {
+    return `data:image/jpeg;base64,${imageString}`; // 使用Base64格式
+  }
+}
 </script>
 
 <template>
@@ -200,9 +208,7 @@ const decrypt = (str: string) => str; // 简单base64解码示例
               <label>开方医生:</label>
               <img
                 v-if="item.doctor_info?.identity_info?.sign_image"
-                :src="`data:image/jpeg;base64,${
-                  item.doctor_info.identity_info.sign_image
-                }`"
+                :src="getImageSource(item.doctor_info.identity_info.sign_image)"
                 alt="签名"
                 style="width: 120px; height: 50px; display: inline-block; "
               />
@@ -212,9 +218,7 @@ const decrypt = (str: string) => str; // 简单base64解码示例
               <label>审核药师:</label>
               <img
                 v-if="item.pharmacist_info?.identity?.sign_image"
-                :src="`data:image/jpeg;base64,${
-                  item.pharmacist_info.identity.sign_image
-                }`"
+                :src="getImageSource(item.pharmacist_info.identity.sign_image)"
                 alt="签名"
                 style="width: 120px; height: 50px; display: inline-block"
               />
@@ -224,9 +228,7 @@ const decrypt = (str: string) => str; // 简单base64解码示例
               <label>调配人:</label>
               <img
                 v-if="item.doctor_info?.identity_info?.sign_image"
-                :src="`data:image/jpeg;base64,${
-                  item.doctor_info.identity_info.sign_image
-                }`"
+                :src="getImageSource(item.doctor_info.identity_info.sign_image)"
                 alt="签名"
                 style="width: 120px; height: 50px; display: inline-block"
               />
@@ -236,9 +238,7 @@ const decrypt = (str: string) => str; // 简单base64解码示例
               <label>核对人:</label>
               <img
                 v-if="item.pharmacist_info?.identity?.sign_image"
-                :src="`data:image/jpeg;base64,${
-                  item.pharmacist_info.identity.sign_image
-                }`"
+                :src="getImageSource(item.pharmacist_info.identity.sign_image)"
                 alt="签名"
                 style="width: 120px; height: 50px; display: inline-block"
               />
@@ -248,9 +248,7 @@ const decrypt = (str: string) => str; // 简单base64解码示例
               <label>发药人:</label>
               <img
                 v-if="item.doctor_info?.identity_info?.sign_image"
-                :src="`data:image/jpeg;base64,${
-                  item.doctor_info.identity_info.sign_image
-                }`"
+                :src="getImageSource(item.doctor_info.identity_info.sign_image)"
                 alt="签名"
                 style="width: 120px; height: 50px; display: inline-block"
               />
diff --git a/apps/web-antd/src/views/doctor/pharmacist/api/index.ts b/apps/web-antd/src/views/doctor/pharmacist/api/index.ts
index ad1c799b..389eb7e4 100644
--- a/apps/web-antd/src/views/doctor/pharmacist/api/index.ts
+++ b/apps/web-antd/src/views/doctor/pharmacist/api/index.ts
@@ -38,6 +38,14 @@ export async function getPharmacistInfo(id: number) {
   return requestClient.get<any>(`${prefix}detail`, { params: { id } });
 }
 
+/**
+ * 获取药师详情 - 编辑
+ * @param id
+ */
+export async function getPharmacistEditInfoApi(id: number) {
+  return requestClient.get<any>(`${prefix}get-edit-info`, { params: { id } });
+}
+
 /**
  * 获取药师详情
  * @param id
diff --git a/apps/web-antd/src/views/doctor/pharmacist/components/modal.vue b/apps/web-antd/src/views/doctor/pharmacist/components/modal.vue
index 6a149e86..9f696b66 100644
--- a/apps/web-antd/src/views/doctor/pharmacist/components/modal.vue
+++ b/apps/web-antd/src/views/doctor/pharmacist/components/modal.vue
@@ -7,7 +7,7 @@ import { message, Alert } from 'ant-design-vue';
 
 import { useVbenForm } from '#/adapter/form';
 
-import { createPharmacist, updatePharmacist } from '../api';
+import {createPharmacist, getPharmacistEditInfoApi, updatePharmacist} from '../api';
 import { infoModalFormProps } from '../config/form';
 
 defineOptions({
@@ -50,23 +50,28 @@ const [Modal, modalApi] = useVbenModal({
       const { values, update } = modalApi.getData<Record<string, any>>();
       if (values) {
         isUpdate.value = update;
-        formApi.setValues(values);
+        getPharmacistEditInfoApi(values.id).then((res) => {
+          formApi.setValues(res);
+        });
+        // formApi.setValues(values);
+      } else {
+        const img = 'https://img2.baidu.com/it/u=3046024791,55863177&fm=253&fmt=auto&app=138&f=JPEG';
+        formApi.setValues({
+          name: '测试药师',
+          mobile: '15110000000',
+          idcard: '134111000022225555',
+          type: 1,
+          sign_type: 2,
+          qualification: img,
+          practicing: img,
+          title: img,
+          card_up: img,
+          card_down: img,
+          sign_image: 'http://demo-1.nailaoyun.cn/p/image/qm1.png',
+          avatar: img,
+        });
       }
-      const img = 'https://img2.baidu.com/it/u=3046024791,55863177&fm=253&fmt=auto&app=138&f=JPEG';
-      formApi.setValues({
-        name: '测试药师',
-        mobile: '15110000000',
-        idcard: '134111000022225555',
-        type: 1,
-        sign_type: 2,
-        qualification: img,
-        practicing: img,
-        title: img,
-        card_up: img,
-        card_down: img,
-        sign_image: img,
-        avatar: img,
-      });
+
     }
   },
 });
diff --git a/apps/web-antd/src/views/doctor/pharmacist/config/form.ts b/apps/web-antd/src/views/doctor/pharmacist/config/form.ts
index bcfdb267..c3a5eb8c 100644
--- a/apps/web-antd/src/views/doctor/pharmacist/config/form.ts
+++ b/apps/web-antd/src/views/doctor/pharmacist/config/form.ts
@@ -76,6 +76,16 @@ export const infoModalFormProps: VbenFormProps = {
         triggerFields: ['id'],
       },
     },
+    {
+      component: 'VbenInput',
+      fieldName: 'su_id',
+      label: 'WxID',
+      formItemClass: 'col-span-6',
+      dependencies: {
+        show: false,
+        triggerFields: ['id'],
+      },
+    },
     {
       fieldName: 'otherinfo',
       label: '基础信息',
@@ -121,6 +131,10 @@ export const infoModalFormProps: VbenFormProps = {
         placeholder: '请选择诊所',
         model: 'multiple',
       },
+      dependencies: {
+        show: false,
+        triggerFields: ['id'],
+      },
       fieldName: 'store_id',
       formItemClass: 'col-span-6',
       label: '诊所',
@@ -175,6 +189,10 @@ export const infoModalFormProps: VbenFormProps = {
       componentProps: {
         placeholder: '请填写身份证',
       },
+      dependencies: {
+        show: false,
+        triggerFields: ['id'],
+      },
       fieldName: 'idcard',
       formItemClass: 'col-span-6',
       label: '身份证',
@@ -215,6 +233,10 @@ export const infoModalFormProps: VbenFormProps = {
           },
         ],
       },
+      dependencies: {
+        show: false,
+        triggerFields: ['id'],
+      },
       fieldName: 'sign_type',
       formItemClass: 'col-span-6',
       label: '签名类型',
diff --git a/apps/web-antd/src/views/doctor/pharmacist/index.vue b/apps/web-antd/src/views/doctor/pharmacist/index.vue
index b7a6b747..ef9079c7 100644
--- a/apps/web-antd/src/views/doctor/pharmacist/index.vue
+++ b/apps/web-antd/src/views/doctor/pharmacist/index.vue
@@ -172,6 +172,14 @@ const refuse = (id: number) => {
               // auth: ['pharmacist', 'sys:role:detail'],
               onClick: showPharmacistDetailModal.bind(null, row),
             },
+            {
+              label: '编辑',
+              type: 'link',
+              icon: 'uil:edit',
+              size: 'small',
+              // auth: ['pharmacist', 'sys:role:detail'],
+              onClick: showModal.bind(null, row),
+            },
             {
               label: '绑定诊所',
               type: 'link',