瀏覽代碼

修改文案: 重置密码 -> 修改密码
修改标题: 病案报告 -> 诊断报告

cc12458 2 周之前
父節點
當前提交
d7cd55a898

+ 2 - 2
src/composables/FloatPanel/FloatPanel.vue

@@ -251,7 +251,7 @@ defineExpose(instance);
         <div class="van-floating-panel__header">
           <div ref="panel-header">
             <van-icon v-if="closable" class="van-floating-panel__header_icon" name="cross" size="18" @click.stop="onClose()" />
-            <div class="van-floating-panel__header-bar"></div>
+            <div class="van-floating-panel__header-bar" v-show="title"></div>
             <slot name="header" :title="title">
               <div>{{ title }}</div>
             </slot>
@@ -290,7 +290,7 @@ defineExpose(instance);
       min-height: 30px;
     }
     .van-floating-panel__header-bar {
-      opacity: 0;
+      //opacity: 0;
       & + * {
         padding: calc($gap / 2) 0;
       }

+ 2 - 1
src/composables/FloatPanel/types.ts

@@ -117,8 +117,9 @@ export interface FloatPanelApi<P extends Record<string, any>, R = any> extends F
   /**
    * 打开面板并传入内容区 props;返回的 Promise 在关闭时 resolve。
    * @param props - 传给 `Content` 或默认插槽作用域的对象
+   * @param title
    */
-  open(props: P | void | null): Promise<R | void>;
+  open(props: P | void | null, title?: string): Promise<R | void>;
 
   /**
    * 关闭面板并 resolve `open` 的 Promise。

+ 4 - 2
src/composables/FloatPanel/useFloatPanel.ts

@@ -34,6 +34,7 @@ export function useFloatPanel<P extends Record<string, any> = Record<string, unk
   let dismissResult: R | void | undefined;
 
   const show = ref(false);
+  const title = ref('');
   /** 为 true 表示正在等待 FloatPanel `closed`,用于忽略重开后的陈旧 `closed` */
   const pendingCloseUnmount = ref(false);
   const panelOpenKey = ref(0);
@@ -60,7 +61,7 @@ export function useFloatPanel<P extends Record<string, any> = Record<string, unk
   }
 
   const api: FloatPanelApi<P, R> = {
-    open(props: P): Promise<R | void> {
+    open(props: P, text = ''): Promise<R | void> {
       pending?.resolve(void 0);
       pending = Promise.withResolvers<R | void>();
       dismissResult = undefined;
@@ -68,6 +69,7 @@ export function useFloatPanel<P extends Record<string, any> = Record<string, unk
       innerProps.value = props;
       panelOpenKey.value += 1;
       show.value = true;
+      title.value = text;
       return pending.promise;
     },
     close(result?: R) {
@@ -137,7 +139,7 @@ export function useFloatPanel<P extends Record<string, any> = Record<string, unk
 
         return h(
           __FloatPanel_vue,
-          { ref: floatPanelRef, key: panelOpenKey.value, closable: true, ...panelBindings },
+          { ref: floatPanelRef, key: panelOpenKey.value, closable: true, title: title.value, ...panelBindings },
           {
             header: slots.header,
             content: () => {

+ 1 - 1
src/modules/monitor/annotator.page.vue

@@ -26,7 +26,7 @@ const edit = useTemplateRef<InstanceType<typeof MedicalReportEdit>>('edit');
 const [FloatPanel, panel] = useFloatPanel<MedicalData, MedicalData>(MedicalRecordPreview);
 const onPreview = () => {
   const data = edit.value?.preview();
-  if (data) panel.open(data as unknown as MedicalData);
+  if (data) panel.open(data as unknown as MedicalData, '诊断报告');
 };
 
 const completeProps = shallowRef<MedicalData>();

+ 3 - 3
src/modules/monitor/composables/usePrint.ts

@@ -23,7 +23,7 @@ const defaultDefinitions = (info?: TDocumentDefinitions['info']) =>
     pageSize,
     pageOrientation: 'portrait',
     pageMargins,
-    info: { author: ``, subject: `病案报告`, keywords: '舌象 面象 标注', creator: '', producer: 'six', ...info },
+    info: { author: ``, subject: `诊断报告`, keywords: '舌象 面象 标注', creator: '', producer: 'six', ...info },
 
     defaultStyle: { font: 'NotoSansSC', fontSize: 14, lineHeight: 1.45, color: '#00000' },
     styles: {
@@ -53,13 +53,13 @@ export function usePrint(data: Ref<MedicalModel | undefined>) {
     source ??= data.value;
     if (!source) throw new Error(`数据为空`);
     try {
-      const title = `病案报告 ${source.code ?? Date.now()}`;
+      const title = `诊断报告 ${source.code ?? Date.now()}`;
       const footerCode = source.code ?? '';
       const report = getMedicalReportData(source?.report as any) as unknown as MedicalModel['report'];
       const content: TDocumentDefinitions['content'] = [
         { canvas: [{ type: 'rect', x: 0, y: 0, w: halfPageContentWidth * 2, h: 40, r: 4, color: palette.dark }] },
         {
-          text: '病 案 报 告',
+          text: '诊 断 报 告',
           fontSize: 18,
           lineHeight: 1,
           color: palette.green,

+ 1 - 1
src/modules/monitor/medical-record.page.vue

@@ -42,7 +42,7 @@ const floatPanelType = ref<'edit-patient' | 'preview'>();
 const [FloatPanel, panel] = useFloatPanel<MedicalString, MedicalString>();
 const onPreview = (item: MedicalString, index: number) => {
   floatPanelType.value = 'preview';
-  panel.open(item);
+  panel.open(item, '诊断报告');
 };
 const onEdit = async (item: MedicalString, index: number) => {
   floatPanelType.value = 'edit-patient';

+ 1 - 1
src/modules/system/components/UpdatePassword.vue

@@ -8,7 +8,7 @@ export interface UpdatePasswordProps {
   token?: string;
 }
 
-const { title = '重置密码', pid, token } = defineProps<UpdatePasswordProps>();
+const { title = '修改密码', pid, token } = defineProps<UpdatePasswordProps>();
 const emits = defineEmits<{
   complete: [];
   cancel: [];

+ 1 - 1
src/modules/system/user.page.vue

@@ -152,7 +152,7 @@ const onRolePickerComplete = (roles: any[]) => {
               <template #value>
                 <van-button square type="danger" text="删除" @click="onDelete(item, index)" />
                 <van-button square type="primary" text="修改" @click="onEdit(item, index)" />
-                <van-button square type="warning" text="重置密码" @click="onResetPassword(item, index)" />
+                <van-button square type="warning" text="修改密码" @click="onResetPassword(item, index)" />
               </template>
             </van-cell>
           </van-list>

+ 1 - 1
src/pages/510k.page.vue

@@ -26,7 +26,7 @@ const settingProps = reactive<Partial<PopoverProps> & { onSelect: any }>({
   closeOnClickAction: true,
   actions: [
     {
-      text: '重置密码',
+      text: '修改密码',
       async callback() {
         const pid = unref(Account.user)?.id;
         if (pid && (await password.open({ pid }))) logout().then();

+ 1 - 1
src/request/model/manage.model.ts

@@ -29,7 +29,7 @@ export interface UserModel {
   account: string;
   roles: RoleModel[];
   /**
-   * 需要重置密码
+   * 需要修改密码
    */
   resetPassword?: boolean;
 }