feat(user): 缓存用户ID到本地存储- 在用户信息存储时增加UserId的本地缓存- 调整多个组件中的字段初始化逻辑

- 统一clinic相关模块的row-key为id
- 移除冗余的默认列配置-修正clinicDoctorApply模块的删除逻辑
- 清理未使用的导入和变量定义
- 调整.env.development中的API地址注释状态

.env.development

@@ -1,5 +1,5 @@
 VITE_APP_NAME=后台管理(开发环境)
-VITE_API_URL=http://127.0.0.1:9200/api
+#VITE_API_URL=http://127.0.0.1:9200/api
 #VITE_SERVER_API_URL=http://127.0.0.1:8000/api
 
 

src/store/modules/user.ts

@@ -67,6 +67,7 @@ export const useUserStore = defineStore({
       this.info = result;
       // 缓存租户信息
       localStorage.setItem('TenantName', `${this.info.tenantName}`);
+      localStorage.setItem('UserId', `${this.info.userId}`);
       // 缓存企业信息
       if (this.info.companyInfo) {
         localStorage.setItem(

src/views/clinic/clinicAppointment/components/clinicAppointmentEdit.vue

@@ -139,15 +139,10 @@
     doctorId: undefined,
     userId: undefined,
     comments: undefined,
-    sortNumber: undefined,
     isDelete: undefined,
     tenantId: undefined,
     createTime: undefined,
     updateTime: undefined,
-    clinicAppointmentId: undefined,
-    clinicAppointmentName: '',
-    status: 0,
-    comments: '',
     sortNumber: 100
   });
 

src/views/clinic/clinicAppointment/index.vue

@@ -3,7 +3,7 @@
       <a-card :bordered="false" :body-style="{ padding: '16px' }">
         <ele-pro-table
           ref="tableRef"
-          row-key="clinicAppointmentId"
+          row-key="id"
           :columns="columns"
           :datasource="datasource"
           :customRow="customRow"
@@ -193,7 +193,7 @@
   /* 删除单个 */
   const remove = (row: ClinicAppointment) => {
     const hide = message.loading('请求中..', 0);
-    removeClinicAppointment(row.clinicAppointmentId)
+    removeClinicAppointment(row.id)
       .then((msg) => {
         hide();
         message.success(msg);

src/views/clinic/clinicDoctorApply/components/clinicDoctorApplyEdit.vue

@@ -280,13 +280,9 @@
     contractTime: undefined,
     expirationTime: undefined,
     rejectReason: undefined,
-    comments: undefined,
     tenantId: undefined,
     createTime: undefined,
     updateTime: undefined,
-    clinicDoctorApplyId: undefined,
-    clinicDoctorApplyName: '',
-    status: 0,
     comments: '',
     sortNumber: 100
   });

src/views/clinic/clinicDoctorApply/index.vue

@@ -291,13 +291,6 @@
     }
   ]);
 
-  // 默认显示的核心列（最多5个主要字段）
-  const defaultVisibleColumns = [
-    'applyId',
-    'createTime',
-    'action'
-  ];
-
   /* 搜索 */
   const reload = (where?: ClinicDoctorApplyParam) => {
     selection.value = [];
@@ -318,7 +311,7 @@
   /* 删除单个 */
   const remove = (row: ClinicDoctorApply) => {
     const hide = message.loading('请求中..', 0);
-    removeClinicDoctorApply(row.id)
+    removeClinicDoctorApply(row.applyId)
       .then((msg) => {
         hide();
         message.success(msg);
@@ -343,7 +336,7 @@
       maskClosable: true,
       onOk: () => {
         const hide = message.loading('请求中..', 0);
-        removeBatchClinicDoctorApply(selection.value.map((d) => d.id))
+        removeBatchClinicDoctorApply(selection.value.map((d) => d.applyId))
           .then((msg) => {
             hide();
             message.success(msg);

src/views/clinic/clinicDoctorMedicalRecord/components/clinicDoctorMedicalRecordEdit.vue

@@ -227,12 +227,7 @@
     comments: undefined,
     tenantId: undefined,
     createTime: undefined,
-    updateTime: undefined,
+    updateTime: undefined
-    clinicDoctorMedicalRecordId: undefined,
-    clinicDoctorMedicalRecordName: '',
-    status: 0,
-    comments: '',
-    sortNumber: 100
   });
 
   /* 更新visible */

src/views/clinic/clinicDoctorMedicalRecord/index.vue

@@ -143,13 +143,6 @@
     }
   ]);
 
-  // 默认显示的核心列（最多5个主要字段）
-  const defaultVisibleColumns = [
-    'id',
-    'createTime',
-    'action'
-  ];
-
   /* 搜索 */
   const reload = (where?: ClinicDoctorMedicalRecordParam) => {
     selection.value = [];

src/views/clinic/clinicDoctorUser/components/clinicDoctorUserEdit.vue

@@ -179,15 +179,10 @@
     consultationCount: undefined,
     qrcode: undefined,
     comments: undefined,
-    sortNumber: undefined,
     isDelete: undefined,
     tenantId: undefined,
     createTime: undefined,
     updateTime: undefined,
-    clinicDoctorUserId: undefined,
-    clinicDoctorUserName: '',
-    status: 0,
-    comments: '',
     sortNumber: 100
   });
 

src/views/clinic/clinicMedicalHistory/components/clinicMedicalHistoryEdit.vue

@@ -228,10 +228,6 @@
     tenantId: undefined,
     createTime: undefined,
     updateTime: undefined,
-    clinicMedicalHistoryId: undefined,
-    clinicMedicalHistoryName: '',
-    status: 0,
-    comments: '',
     sortNumber: 100
   });
 

src/views/clinic/clinicMedicalHistory/index.vue

@@ -249,13 +249,6 @@
     }
   ]);
 
-  // 默认显示的核心列（最多5个主要字段）
-  const defaultVisibleColumns = [
-    'id',
-    'createTime',
-    'action'
-  ];
-
   /* 搜索 */
   const reload = (where?: ClinicMedicalHistoryParam) => {
     selection.value = [];

src/views/clinic/clinicMedicine/components/clinicMedicineEdit.vue

@@ -91,14 +91,13 @@
 <script lang="ts" setup>
   import { ref, reactive, watch } from 'vue';
   import { Form, message } from 'ant-design-vue';
-  import { assignObject, uuid } from 'ele-admin-pro';
+  import { assignObject } from 'ele-admin-pro';
   import { addClinicMedicine, updateClinicMedicine } from '@/api/clinic/clinicMedicine';
   import { ClinicMedicine } from '@/api/clinic/clinicMedicine/model';
   import { useThemeStore } from '@/store/modules/theme';
   import { storeToRefs } from 'pinia';
   import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
   import { FormInstance } from 'ant-design-vue/es/form';
-  import { FileRecord } from '@/api/system/file/model';
 
   // 是否是修改
   const isUpdate = ref(false);
@@ -142,12 +141,7 @@
     comments: undefined,
     tenantId: undefined,
     createTime: undefined,
-    updateTime: undefined,
+    updateTime: undefined
-    clinicMedicineId: undefined,
-    clinicMedicineName: '',
-    status: 0,
-    comments: '',
-    sortNumber: 100
   });
 
   /* 更新visible */
@@ -167,20 +161,6 @@
     ]
   });
 
-  const chooseImage = (data: FileRecord) => {
-    images.value.push({
-      uid: data.id,
-      url: data.path,
-      status: 'done'
-    });
-    form.image = data.path;
-  };
-
-  const onDeleteItem = (index: number) => {
-    images.value.splice(index, 1);
-    form.image = '';
-  };
-
   const { resetFields } = useForm(form, rules);
 
   /* 保存编辑 */
@@ -218,13 +198,6 @@
         images.value = [];
         if (props.data) {
           assignObject(form, props.data);
-          if(props.data.image){
-            images.value.push({
-              uid: uuid(),
-              url: props.data.image,
-              status: 'done'
-            })
-          }
           isUpdate.value = true;
         } else {
           isUpdate.value = false;

src/views/clinic/clinicMedicineInout/components/clinicMedicineInoutEdit.vue

@@ -224,15 +224,10 @@
     isInvalid: undefined,
     isSettled: undefined,
     settleTime: undefined,
-    comments: undefined,
     tenantId: undefined,
     createTime: undefined,
     updateTime: undefined,
-    clinicMedicineInoutId: undefined,
+    comments: ''
-    clinicMedicineInoutName: '',
-    status: 0,
-    comments: '',
-    sortNumber: 100
   });
 
   /* 更新visible */

src/views/clinic/clinicMedicineInout/index.vue

@@ -3,7 +3,7 @@
       <a-card :bordered="false" :body-style="{ padding: '16px' }">
         <ele-pro-table
           ref="tableRef"
-          row-key="clinicMedicineInoutId"
+          row-key="id"
           :columns="columns"
           :datasource="datasource"
           :customRow="customRow"
@@ -249,13 +249,6 @@
     }
   ]);
 
-  // 默认显示的核心列（最多5个主要字段）
-  const defaultVisibleColumns = [
-    'id',
-    'createTime',
-    'action'
-  ];
-
   /* 搜索 */
   const reload = (where?: ClinicMedicineInoutParam) => {
     selection.value = [];
@@ -276,7 +269,7 @@
   /* 删除单个 */
   const remove = (row: ClinicMedicineInout) => {
     const hide = message.loading('请求中..', 0);
-    removeClinicMedicineInout(row.clinicMedicineInoutId)
+    removeClinicMedicineInout(row.id)
       .then((msg) => {
         hide();
         message.success(msg);
@@ -301,7 +294,7 @@
       maskClosable: true,
       onOk: () => {
         const hide = message.loading('请求中..', 0);
-        removeBatchClinicMedicineInout(selection.value.map((d) => d.clinicMedicineInoutId))
+        removeBatchClinicMedicineInout(selection.value.map((d) => d.id))
           .then((msg) => {
             hide();
             message.success(msg);

src/views/clinic/clinicMedicineStock/components/clinicMedicineStockEdit.vue

@@ -120,15 +120,10 @@
     minStockLevel: undefined,
     lastUpdated: undefined,
     userId: undefined,
-    comments: undefined,
     tenantId: undefined,
     createTime: undefined,
     updateTime: undefined,
-    clinicMedicineStockId: undefined,
+    comments: ''
-    clinicMedicineStockName: '',
-    status: 0,
-    comments: '',
-    sortNumber: 100
   });
 
   /* 更新visible */

src/views/clinic/clinicMedicineStock/index.vue

@@ -3,7 +3,7 @@
       <a-card :bordered="false" :body-style="{ padding: '16px' }">
         <ele-pro-table
           ref="tableRef"
-          row-key="clinicMedicineStockId"
+          row-key="id"
           :columns="columns"
           :datasource="datasource"
           :customRow="customRow"
@@ -171,13 +171,6 @@
     }
   ]);
 
-  // 默认显示的核心列（最多5个主要字段）
-  const defaultVisibleColumns = [
-    'id',
-    'createTime',
-    'action'
-  ];
-
   /* 搜索 */
   const reload = (where?: ClinicMedicineStockParam) => {
     selection.value = [];
@@ -198,7 +191,7 @@
   /* 删除单个 */
   const remove = (row: ClinicMedicineStock) => {
     const hide = message.loading('请求中..', 0);
-    removeClinicMedicineStock(row.clinicMedicineStockId)
+    removeClinicMedicineStock(row.id)
       .then((msg) => {
         hide();
         message.success(msg);
@@ -223,7 +216,7 @@
       maskClosable: true,
       onOk: () => {
         const hide = message.loading('请求中..', 0);
-        removeBatchClinicMedicineStock(selection.value.map((d) => d.clinicMedicineStockId))
+        removeBatchClinicMedicineStock(selection.value.map((d) => d.id))
           .then((msg) => {
             hide();
             message.success(msg);

src/views/clinic/clinicOrder/components/clinicOrderEdit.vue

@@ -649,15 +649,10 @@
     version: undefined,
     userId: undefined,
     comments: undefined,
-    sortNumber: undefined,
     deleted: undefined,
     tenantId: undefined,
     updateTime: undefined,
     createTime: undefined,
-    clinicOrderId: undefined,
-    clinicOrderName: '',
-    status: 0,
-    comments: '',
     sortNumber: 100
   });
 

src/views/clinic/clinicOrder/index.vue

@@ -3,7 +3,7 @@
       <a-card :bordered="false" :body-style="{ padding: '16px' }">
         <ele-pro-table
           ref="tableRef"
-          row-key="clinicOrderId"
+          row-key="id"
           :columns="columns"
           :datasource="datasource"
           :customRow="customRow"
@@ -49,7 +49,7 @@
 </template>
 
 <script lang="ts" setup>
-  import { createVNode, ref, computed } from 'vue';
+  import { createVNode, ref } from 'vue';
   import { message, Modal } from 'ant-design-vue';
   import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
   import type { EleProTable } from 'ele-admin-pro';
@@ -567,14 +567,6 @@
     }
   ]);
 
-  // 默认显示的核心列（最多5个主要字段）
-  const defaultVisibleColumns = [
-    'orderId',
-    'title',
-    'createTime',
-    'action'
-  ];
-
   /* 搜索 */
   const reload = (where?: ClinicOrderParam) => {
     selection.value = [];
@@ -595,7 +587,7 @@
   /* 删除单个 */
   const remove = (row: ClinicOrder) => {
     const hide = message.loading('请求中..', 0);
-    removeClinicOrder(row.clinicOrderId)
+    removeClinicOrder(row.orderId)
       .then((msg) => {
         hide();
         message.success(msg);
@@ -620,7 +612,7 @@
       maskClosable: true,
       onOk: () => {
         const hide = message.loading('请求中..', 0);
-        removeBatchClinicOrder(selection.value.map((d) => d.clinicOrderId))
+        removeBatchClinicOrder(selection.value.map((d) => d.orderId))
           .then((msg) => {
             hide();
             message.success(msg);

src/views/clinic/clinicPrescription/components/clinicPrescriptionEdit.vue

@@ -222,20 +222,6 @@
     ]
   });
 
-  const chooseImage = (data: FileRecord) => {
-    images.value.push({
-      uid: data.id,
-      url: data.path,
-      status: 'done'
-    });
-    form.image = data.path;
-  };
-
-  const onDeleteItem = (index: number) => {
-    images.value.splice(index, 1);
-    form.image = '';
-  };
-
   const { resetFields } = useForm(form, rules);
 
   /* 保存编辑 */
@@ -273,13 +259,6 @@
         images.value = [];
         if (props.data) {
           assignObject(form, props.data);
-          if(props.data.image){
-            images.value.push({
-              uid: uuid(),
-              url: props.data.image,
-              status: 'done'
-            })
-          }
           isUpdate.value = true;
         } else {
           isUpdate.value = false;

src/views/clinic/clinicPrescription/index.vue

@@ -231,14 +231,6 @@
     }
   ]);
 
-  // 默认显示的核心列（最多5个主要字段）
-  const defaultVisibleColumns = [
-    'id',
-    'status',
-    'createTime',
-    'action'
-  ];
-
   /* 搜索 */
   const reload = (where?: ClinicPrescriptionParam) => {
     selection.value = [];

src/views/clinic/clinicPrescriptionItem/components/clinicPrescriptionItemEdit.vue

@@ -120,14 +120,13 @@
 <script lang="ts" setup>
   import { ref, reactive, watch } from 'vue';
   import { Form, message } from 'ant-design-vue';
-  import { assignObject, uuid } from 'ele-admin-pro';
+  import { assignObject } from 'ele-admin-pro';
   import { addClinicPrescriptionItem, updateClinicPrescriptionItem } from '@/api/clinic/clinicPrescriptionItem';
   import { ClinicPrescriptionItem } from '@/api/clinic/clinicPrescriptionItem/model';
   import { useThemeStore } from '@/store/modules/theme';
   import { storeToRefs } from 'pinia';
   import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
   import { FormInstance } from 'ant-design-vue/es/form';
-  import { FileRecord } from '@/api/system/file/model';
 
   // 是否是修改
   const isUpdate = ref(false);
@@ -193,20 +192,6 @@
     ]
   });
 
-  const chooseImage = (data: FileRecord) => {
-    images.value.push({
-      uid: data.id,
-      url: data.path,
-      status: 'done'
-    });
-    form.image = data.path;
-  };
-
-  const onDeleteItem = (index: number) => {
-    images.value.splice(index, 1);
-    form.image = '';
-  };
-
   const { resetFields } = useForm(form, rules);
 
   /* 保存编辑 */
@@ -244,13 +229,6 @@
         images.value = [];
         if (props.data) {
           assignObject(form, props.data);
-          if(props.data.image){
-            images.value.push({
-              uid: uuid(),
-              url: props.data.image,
-              status: 'done'
-            })
-          }
           isUpdate.value = true;
         } else {
           isUpdate.value = false;

src/views/clinic/clinicPrescriptionItem/index.vue

@@ -207,13 +207,6 @@
     }
   ]);
 
-  // 默认显示的核心列（最多5个主要字段）
-  const defaultVisibleColumns = [
-    'id',
-    'createTime',
-    'action'
-  ];
-
   /* 搜索 */
   const reload = (where?: ClinicPrescriptionItemParam) => {
     selection.value = [];

src/views/clinic/clinicReport/components/clinicReportEdit.vue

@@ -224,15 +224,10 @@
     isInvalid: undefined,
     isSettled: undefined,
     settleTime: undefined,
-    comments: undefined,
     tenantId: undefined,
     createTime: undefined,
     updateTime: undefined,
-    clinicReportId: undefined,
+    comments: ''
-    clinicReportName: '',
-    status: 0,
-    comments: '',
-    sortNumber: 100
   });
 
   /* 更新visible */

src/views/clinic/clinicReport/index.vue

@@ -3,7 +3,7 @@
       <a-card :bordered="false" :body-style="{ padding: '16px' }">
         <ele-pro-table
           ref="tableRef"
-          row-key="clinicReportId"
+          row-key="id"
           :columns="columns"
           :datasource="datasource"
           :customRow="customRow"
@@ -49,7 +49,7 @@
 </template>
 
 <script lang="ts" setup>
-  import { createVNode, ref, computed } from 'vue';
+  import { createVNode, ref } from 'vue';
   import { message, Modal } from 'ant-design-vue';
   import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
   import type { EleProTable } from 'ele-admin-pro';
@@ -249,13 +249,6 @@
     }
   ]);
 
-  // 默认显示的核心列（最多5个主要字段）
-  const defaultVisibleColumns = [
-    'id',
-    'createTime',
-    'action'
-  ];
-
   /* 搜索 */
   const reload = (where?: ClinicReportParam) => {
     selection.value = [];
@@ -276,7 +269,7 @@
   /* 删除单个 */
   const remove = (row: ClinicReport) => {
     const hide = message.loading('请求中..', 0);
-    removeClinicReport(row.clinicReportId)
+    removeClinicReport(row.id)
       .then((msg) => {
         hide();
         message.success(msg);
@@ -301,7 +294,7 @@
       maskClosable: true,
       onOk: () => {
         const hide = message.loading('请求中..', 0);
-        removeBatchClinicReport(selection.value.map((d) => d.clinicReportId))
+        removeBatchClinicReport(selection.value.map((d) => d.id))
           .then((msg) => {
             hide();
             message.success(msg);

src/views/clinic/clinicVisitRecord/components/clinicVisitRecordEdit.vue

@@ -227,12 +227,7 @@
     comments: undefined,
     tenantId: undefined,
     createTime: undefined,
-    updateTime: undefined,
+    updateTime: undefined
-    clinicVisitRecordId: undefined,
-    clinicVisitRecordName: '',
-    status: 0,
-    comments: '',
-    sortNumber: 100
   });
 
   /* 更新visible */
@@ -252,20 +247,6 @@
     ]
   });
 
-  const chooseImage = (data: FileRecord) => {
-    images.value.push({
-      uid: data.id,
-      url: data.path,
-      status: 'done'
-    });
-    form.image = data.path;
-  };
-
-  const onDeleteItem = (index: number) => {
-    images.value.splice(index, 1);
-    form.image = '';
-  };
-
   const { resetFields } = useForm(form, rules);
 
   /* 保存编辑 */
@@ -303,13 +284,6 @@
         images.value = [];
         if (props.data) {
           assignObject(form, props.data);
-          if(props.data.image){
-            images.value.push({
-              uid: uuid(),
-              url: props.data.image,
-              status: 'done'
-            })
-          }
           isUpdate.value = true;
         } else {
           isUpdate.value = false;

src/views/clinic/clinicVisitRecord/index.vue

@@ -3,7 +3,7 @@
       <a-card :bordered="false" :body-style="{ padding: '16px' }">
         <ele-pro-table
           ref="tableRef"
-          row-key="clinicVisitRecordId"
+          row-key="id"
           :columns="columns"
           :datasource="datasource"
           :customRow="customRow"
@@ -49,7 +49,7 @@
 </template>
 
 <script lang="ts" setup>
-  import { createVNode, ref, computed } from 'vue';
+  import { createVNode, ref } from 'vue';
   import { message, Modal } from 'ant-design-vue';
   import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
   import type { EleProTable } from 'ele-admin-pro';
@@ -249,13 +249,6 @@
     }
   ]);
 
-  // 默认显示的核心列（最多5个主要字段）
-  const defaultVisibleColumns = [
-    'id',
-    'createTime',
-    'action'
-  ];
-
   /* 搜索 */
   const reload = (where?: ClinicVisitRecordParam) => {
     selection.value = [];
@@ -276,7 +269,7 @@
   /* 删除单个 */
   const remove = (row: ClinicVisitRecord) => {
     const hide = message.loading('请求中..', 0);
-    removeClinicVisitRecord(row.clinicVisitRecordId)
+    removeClinicVisitRecord(row.id)
       .then((msg) => {
         hide();
         message.success(msg);
@@ -301,7 +294,7 @@
       maskClosable: true,
       onOk: () => {
         const hide = message.loading('请求中..', 0);
-        removeBatchClinicVisitRecord(selection.value.map((d) => d.clinicVisitRecordId))
+        removeBatchClinicVisitRecord(selection.value.map((d) => d.id))
           .then((msg) => {
             hide();
             message.success(msg);