From c865bb29ece4a9258a067f6d155f132a15ad0c54 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Wed, 2 Jul 2025 14:15:50 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=B0=E4=BD=8F?= =?UTF-8?q?=E5=AF=86=E7=A0=81=E7=9A=84=E7=99=BB=E5=BD=95=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E5=8F=8A=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF=E9=87=8Clogo?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ConfigMaterial/ConfigMaterialInfoList.vue | 6 +++--- src/views/system/loginmini/MiniLogin.vue | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue b/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue index 47d6d6a..f4beefe 100644 --- a/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue +++ b/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue @@ -63,7 +63,7 @@
- + {{ item.title }}
@@ -81,7 +81,7 @@ @@ -92,7 +92,7 @@
- {{item2.title}} + {{item2.title}}
diff --git a/src/views/system/loginmini/MiniLogin.vue b/src/views/system/loginmini/MiniLogin.vue index 98af1fd..25c654a 100644 --- a/src/views/system/loginmini/MiniLogin.vue +++ b/src/views/system/loginmini/MiniLogin.vue @@ -515,4 +515,22 @@ html[data-theme='dark'] { background: transparent; } } +/* Chrome/Edge/Safari */ +input:-webkit-autofill, +input:-webkit-autofill:hover, +input:-webkit-autofill:focus { + /* 重新设置背景色、文字色、边框等 */ + background-color: #f5f5f5 !important; + color: #333333 !important; + /* 取消浏览器自己的内阴影 */ + box-shadow: 0 0 0px 1000px #f5f5f5 inset !important; + /* 如果需要边框高亮，也可以一起重置 */ + // border: 1px solid #ccc !important; +} + +/* Firefox */ +input:-moz-autofill { + background-color: #f5f5f5 !important; + color: #333333 !important; +} From 5f98eb82299ee45615981a6d1d619f58f63affef Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Thu, 3 Jul 2025 08:55:08 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=AE=BF=E9=97=AE=E8=B7=AF=E5=BE=84=EF=BC=88=E4=B8=BB=E8=A6=81?= =?UTF-8?q?=E6=98=AF=E7=89=A9=E6=96=99=E5=8F=8A=E8=BF=9B=E9=94=80=E5=AD=98?= =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ConfigMaterial/ConfigMaterialCategory.api.ts | 16 ++++++++-------- .../ConfigMaterial/ConfigMaterialInfo.api.ts | 14 +++++++------- .../ConfigMaterial/ConfigMaterialInfoList.vue | 2 +- .../ConfigMaterialMedication.api.ts | 14 +++++++------- .../ConfigMaterial/ConfigMaterialType.api.ts | 14 +++++++------- .../components/ConfigMaterialCategoryForm.vue | 2 +- .../ConfigSuppliersInfo.api.ts | 14 +++++++------- .../components/ConfigSuppliersInfoForm.vue | 2 +- src/views/invoicing/jxc/JxcInfo.api.ts | 14 +++++++------- .../QgdInfo.api.ts} | 0 .../QgdInfo.data.ts} | 0 .../QgdInfoList.vue} | 6 +++--- .../components/QgdInfoForm.vue} | 2 +- .../components/QgdInfoModal.vue} | 2 +- .../QgdMain.api.ts} | 0 .../QgdMain.data.ts} | 0 .../QgdMainList.vue} | 6 +++--- .../components/QgdMainForm.vue} | 2 +- .../components/QgdMainModal.vue} | 2 +- 19 files changed, 56 insertions(+), 56 deletions(-) rename src/views/invoicing/{nuInvoicingQgdInfo/NuInvoicingQgdInfo.api.ts => qgdInfo/QgdInfo.api.ts} (100%) rename src/views/invoicing/{nuInvoicingQgdInfo/NuInvoicingQgdInfo.data.ts => qgdInfo/QgdInfo.data.ts} (100%) rename src/views/invoicing/{nuInvoicingQgdInfo/NuInvoicingQgdInfoList.vue => qgdInfo/QgdInfoList.vue} (96%) rename src/views/invoicing/{nuInvoicingQgdInfo/components/NuInvoicingQgdInfoForm.vue => qgdInfo/components/QgdInfoForm.vue} (99%) rename src/views/invoicing/{nuInvoicingQgdInfo/components/NuInvoicingQgdInfoModal.vue => qgdInfo/components/QgdInfoModal.vue} (96%) rename src/views/invoicing/{nuInvoicingQgdMain/NuInvoicingQgdMain.api.ts => qgdMain/QgdMain.api.ts} (100%) rename src/views/invoicing/{nuInvoicingQgdMain/NuInvoicingQgdMain.data.ts => qgdMain/QgdMain.data.ts} (100%) rename src/views/invoicing/{nuInvoicingQgdMain/NuInvoicingQgdMainList.vue => qgdMain/QgdMainList.vue} (96%) rename src/views/invoicing/{nuInvoicingQgdMain/components/NuInvoicingQgdMainForm.vue => qgdMain/components/QgdMainForm.vue} (98%) rename src/views/invoicing/{nuInvoicingQgdMain/components/NuInvoicingQgdMainModal.vue => qgdMain/components/QgdMainModal.vue} (96%) diff --git a/src/views/invoicing/ConfigMaterial/ConfigMaterialCategory.api.ts b/src/views/invoicing/ConfigMaterial/ConfigMaterialCategory.api.ts index 6fd36df..c508ebe 100644 --- a/src/views/invoicing/ConfigMaterial/ConfigMaterialCategory.api.ts +++ b/src/views/invoicing/ConfigMaterial/ConfigMaterialCategory.api.ts @@ -4,14 +4,14 @@ import { useMessage } from "/@/hooks/web/useMessage"; const { createConfirm } = useMessage(); enum Api { - list = '/ConfigMaterial/configMaterialCategory/list', - selectMaterialList = '/ConfigMaterial/configMaterialCategory/selectMaterialList', - save='/ConfigMaterial/configMaterialCategory/add', - edit='/ConfigMaterial/configMaterialCategory/edit', - deleteOne = '/ConfigMaterial/configMaterialCategory/delete', - deleteBatch = '/ConfigMaterial/configMaterialCategory/deleteBatch', - importExcel = '/ConfigMaterial/configMaterialCategory/importExcel', - exportXls = '/ConfigMaterial/configMaterialCategory/exportXls', + list = '/invoicing/configMaterialCategory/list', + selectMaterialList = '/invoicing/configMaterialCategory/selectMaterialList', + save='/invoicing/configMaterialCategory/add', + edit='/invoicing/configMaterialCategory/edit', + deleteOne = '/invoicing/configMaterialCategory/delete', + deleteBatch = '/invoicing/configMaterialCategory/deleteBatch', + importExcel = '/invoicing/configMaterialCategory/importExcel', + exportXls = '/invoicing/configMaterialCategory/exportXls', } /** * 导出api diff --git a/src/views/invoicing/ConfigMaterial/ConfigMaterialInfo.api.ts b/src/views/invoicing/ConfigMaterial/ConfigMaterialInfo.api.ts index 2b60dbf..d9a9b4f 100644 --- a/src/views/invoicing/ConfigMaterial/ConfigMaterialInfo.api.ts +++ b/src/views/invoicing/ConfigMaterial/ConfigMaterialInfo.api.ts @@ -4,13 +4,13 @@ import { useMessage } from "/@/hooks/web/useMessage"; const { createConfirm } = useMessage(); enum Api { - list = '/configMaterialInfo/configMaterialInfo/list', - save='/configMaterialInfo/configMaterialInfo/add', - edit='/configMaterialInfo/configMaterialInfo/edit', - deleteOne = '/configMaterialInfo/configMaterialInfo/delete', - deleteBatch = '/configMaterialInfo/configMaterialInfo/deleteBatch', - importExcel = '/configMaterialInfo/configMaterialInfo/importExcel', - exportXls = '/configMaterialInfo/configMaterialInfo/exportXls', + list = '/invoicing/configMaterialInfo/list', + save='/invoicing/configMaterialInfo/add', + edit='/invoicing/configMaterialInfo/edit', + deleteOne = '/invoicing/configMaterialInfo/delete', + deleteBatch = '/invoicing/configMaterialInfo/deleteBatch', + importExcel = '/invoicing/configMaterialInfo/importExcel', + exportXls = '/invoicing/configMaterialInfo/exportXls', } /** diff --git a/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue b/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue index f4beefe..fe3d041 100644 --- a/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue +++ b/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue @@ -343,7 +343,7 @@ const getCardStyle = (index,allSize) => { // 自动请求并暴露内部方法 onMounted(() => { - defHttp.get({url:'/ConfigMaterial/configMaterialCategory/getMaterialTreeData'}).then(res =>{ + defHttp.get({url:'/invoicing/configMaterialCategory/getMaterialTreeData'}).then(res =>{ treeData.value = res; console.log("🚀 ~ defHttp.get ~ treeData:", treeData) console.log("🚀 ~ defHttp.get ~ res:", res) diff --git a/src/views/invoicing/ConfigMaterial/ConfigMaterialMedication.api.ts b/src/views/invoicing/ConfigMaterial/ConfigMaterialMedication.api.ts index 37011e5..e09d77a 100644 --- a/src/views/invoicing/ConfigMaterial/ConfigMaterialMedication.api.ts +++ b/src/views/invoicing/ConfigMaterial/ConfigMaterialMedication.api.ts @@ -4,13 +4,13 @@ import { useMessage } from "/@/hooks/web/useMessage"; const { createConfirm } = useMessage(); enum Api { - list = '/ConfigMaterial/configMaterialMedication/list', - save='/ConfigMaterial/configMaterialMedication/add', - edit='/ConfigMaterial/configMaterialMedication/edit', - deleteOne = '/ConfigMaterial/configMaterialMedication/delete', - deleteBatch = '/ConfigMaterial/configMaterialMedication/deleteBatch', - importExcel = '/ConfigMaterial/configMaterialMedication/importExcel', - exportXls = '/ConfigMaterial/configMaterialMedication/exportXls', + list = '/invoicing/configMaterialMedication/list', + save='/invoicing/configMaterialMedication/add', + edit='/invoicing/configMaterialMedication/edit', + deleteOne = '/invoicing/configMaterialMedication/delete', + deleteBatch = '/invoicing/configMaterialMedication/deleteBatch', + importExcel = '/invoicing/configMaterialMedication/importExcel', + exportXls = '/invoicing/configMaterialMedication/exportXls', } /** diff --git a/src/views/invoicing/ConfigMaterial/ConfigMaterialType.api.ts b/src/views/invoicing/ConfigMaterial/ConfigMaterialType.api.ts index 8cd2fe5..929cde7 100644 --- a/src/views/invoicing/ConfigMaterial/ConfigMaterialType.api.ts +++ b/src/views/invoicing/ConfigMaterial/ConfigMaterialType.api.ts @@ -4,13 +4,13 @@ import { useMessage } from "/@/hooks/web/useMessage"; const { createConfirm } = useMessage(); enum Api { - list = '/ConfigMaterial/configMaterialType/list', - save='/ConfigMaterial/configMaterialType/add', - edit='/ConfigMaterial/configMaterialType/edit', - deleteOne = '/ConfigMaterial/configMaterialType/delete', - deleteBatch = '/ConfigMaterial/configMaterialType/deleteBatch', - importExcel = '/ConfigMaterial/configMaterialType/importExcel', - exportXls = '/ConfigMaterial/configMaterialType/exportXls', + list = '/invoicing/configMaterialType/list', + save='/invoicing/configMaterialType/add', + edit='/invoicing/configMaterialType/edit', + deleteOne = '/invoicing/configMaterialType/delete', + deleteBatch = '/invoicing/configMaterialType/deleteBatch', + importExcel = '/invoicing/configMaterialType/importExcel', + exportXls = '/invoicing/configMaterialType/exportXls', } /** diff --git a/src/views/invoicing/ConfigMaterial/components/ConfigMaterialCategoryForm.vue b/src/views/invoicing/ConfigMaterial/components/ConfigMaterialCategoryForm.vue index 5315af2..61e9b70 100644 --- a/src/views/invoicing/ConfigMaterial/components/ConfigMaterialCategoryForm.vue +++ b/src/views/invoicing/ConfigMaterial/components/ConfigMaterialCategoryForm.vue @@ -40,7 +40,7 @@ }); let formData = {}; - const queryByIdUrl = '/ConfigMaterial/configMaterialCategory/queryById'; + const queryByIdUrl = '/invoicing/configMaterialCategory/queryById'; async function initFormData(){ let params = {id: props.formData.dataId}; const data = await defHttp.get({url: queryByIdUrl, params}); diff --git a/src/views/invoicing/configSuppliersInfo/ConfigSuppliersInfo.api.ts b/src/views/invoicing/configSuppliersInfo/ConfigSuppliersInfo.api.ts index ef9beab..95d6e66 100644 --- a/src/views/invoicing/configSuppliersInfo/ConfigSuppliersInfo.api.ts +++ b/src/views/invoicing/configSuppliersInfo/ConfigSuppliersInfo.api.ts @@ -4,13 +4,13 @@ import { useMessage } from "/@/hooks/web/useMessage"; const { createConfirm } = useMessage(); enum Api { - list = '/configSuppliersInfo/configSuppliersInfo/list', - save='/configSuppliersInfo/configSuppliersInfo/add', - edit='/configSuppliersInfo/configSuppliersInfo/edit', - deleteOne = '/configSuppliersInfo/configSuppliersInfo/delete', - deleteBatch = '/configSuppliersInfo/configSuppliersInfo/deleteBatch', - importExcel = '/configSuppliersInfo/configSuppliersInfo/importExcel', - exportXls = '/configSuppliersInfo/configSuppliersInfo/exportXls', + list = '/invoicing/configSuppliersInfo/list', + save='/invoicing/configSuppliersInfo/add', + edit='/invoicing/configSuppliersInfo/edit', + deleteOne = '/invoicing/configSuppliersInfo/delete', + deleteBatch = '/invoicing/configSuppliersInfo/deleteBatch', + importExcel = '/invoicing/configSuppliersInfo/importExcel', + exportXls = '/invoicing/configSuppliersInfo/exportXls', } /** * 导出api diff --git a/src/views/invoicing/configSuppliersInfo/components/ConfigSuppliersInfoForm.vue b/src/views/invoicing/configSuppliersInfo/components/ConfigSuppliersInfoForm.vue index 13537fd..8a4832b 100644 --- a/src/views/invoicing/configSuppliersInfo/components/ConfigSuppliersInfoForm.vue +++ b/src/views/invoicing/configSuppliersInfo/components/ConfigSuppliersInfoForm.vue @@ -40,7 +40,7 @@ }); let formData = {}; - const queryByIdUrl = '/configSuppliersInfo/configSuppliersInfo/queryById'; + const queryByIdUrl = '/invoicing/configSuppliersInfo/queryById'; async function initFormData(){ let params = {id: props.formData.dataId}; const data = await defHttp.get({url: queryByIdUrl, params}); diff --git a/src/views/invoicing/jxc/JxcInfo.api.ts b/src/views/invoicing/jxc/JxcInfo.api.ts index 2b60dbf..d9a9b4f 100644 --- a/src/views/invoicing/jxc/JxcInfo.api.ts +++ b/src/views/invoicing/jxc/JxcInfo.api.ts @@ -4,13 +4,13 @@ import { useMessage } from "/@/hooks/web/useMessage"; const { createConfirm } = useMessage(); enum Api { - list = '/configMaterialInfo/configMaterialInfo/list', - save='/configMaterialInfo/configMaterialInfo/add', - edit='/configMaterialInfo/configMaterialInfo/edit', - deleteOne = '/configMaterialInfo/configMaterialInfo/delete', - deleteBatch = '/configMaterialInfo/configMaterialInfo/deleteBatch', - importExcel = '/configMaterialInfo/configMaterialInfo/importExcel', - exportXls = '/configMaterialInfo/configMaterialInfo/exportXls', + list = '/invoicing/configMaterialInfo/list', + save='/invoicing/configMaterialInfo/add', + edit='/invoicing/configMaterialInfo/edit', + deleteOne = '/invoicing/configMaterialInfo/delete', + deleteBatch = '/invoicing/configMaterialInfo/deleteBatch', + importExcel = '/invoicing/configMaterialInfo/importExcel', + exportXls = '/invoicing/configMaterialInfo/exportXls', } /** diff --git a/src/views/invoicing/nuInvoicingQgdInfo/NuInvoicingQgdInfo.api.ts b/src/views/invoicing/qgdInfo/QgdInfo.api.ts similarity index 100% rename from src/views/invoicing/nuInvoicingQgdInfo/NuInvoicingQgdInfo.api.ts rename to src/views/invoicing/qgdInfo/QgdInfo.api.ts diff --git a/src/views/invoicing/nuInvoicingQgdInfo/NuInvoicingQgdInfo.data.ts b/src/views/invoicing/qgdInfo/QgdInfo.data.ts similarity index 100% rename from src/views/invoicing/nuInvoicingQgdInfo/NuInvoicingQgdInfo.data.ts rename to src/views/invoicing/qgdInfo/QgdInfo.data.ts diff --git a/src/views/invoicing/nuInvoicingQgdInfo/NuInvoicingQgdInfoList.vue b/src/views/invoicing/qgdInfo/QgdInfoList.vue similarity index 96% rename from src/views/invoicing/nuInvoicingQgdInfo/NuInvoicingQgdInfoList.vue rename to src/views/invoicing/qgdInfo/QgdInfoList.vue index aa7d8e5..cc9521b 100644 --- a/src/views/invoicing/nuInvoicingQgdInfo/NuInvoicingQgdInfoList.vue +++ b/src/views/invoicing/qgdInfo/QgdInfoList.vue @@ -46,10 +46,10 @@ import { ref, reactive } from 'vue'; import { BasicTable, useTable, TableAction } from '/@/components/Table'; import { useListPage } from '/@/hooks/system/useListPage'; - import { columns, superQuerySchema } from './NuInvoicingQgdInfo.data'; - import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './NuInvoicingQgdInfo.api'; + import { columns, superQuerySchema } from './QgdInfo.data'; + import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './QgdInfo.api'; import { downloadFile } from '/@/utils/common/renderUtils'; - import NuInvoicingQgdInfoModal from './components/NuInvoicingQgdInfoModal.vue' + import NuInvoicingQgdInfoModal from './components/QgdInfoModal.vue' import { useUserStore } from '/@/store/modules/user'; const formRef = ref(); diff --git a/src/views/invoicing/nuInvoicingQgdInfo/components/NuInvoicingQgdInfoForm.vue b/src/views/invoicing/qgdInfo/components/QgdInfoForm.vue similarity index 99% rename from src/views/invoicing/nuInvoicingQgdInfo/components/NuInvoicingQgdInfoForm.vue rename to src/views/invoicing/qgdInfo/components/QgdInfoForm.vue index d80d859..fd4bd0b 100644 --- a/src/views/invoicing/nuInvoicingQgdInfo/components/NuInvoicingQgdInfoForm.vue +++ b/src/views/invoicing/qgdInfo/components/QgdInfoForm.vue @@ -61,7 +61,7 @@ import { defHttp } from '/@/utils/http/axios'; import { useMessage } from '/@/hooks/web/useMessage'; import { getValueType } from '/@/utils'; - import { saveOrUpdate } from '../NuInvoicingQgdInfo.api'; + import { saveOrUpdate } from '../QgdInfo.api'; import { Form } from 'ant-design-vue'; import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue'; const props = defineProps({ diff --git a/src/views/invoicing/nuInvoicingQgdInfo/components/NuInvoicingQgdInfoModal.vue b/src/views/invoicing/qgdInfo/components/QgdInfoModal.vue similarity index 96% rename from src/views/invoicing/nuInvoicingQgdInfo/components/NuInvoicingQgdInfoModal.vue rename to src/views/invoicing/qgdInfo/components/QgdInfoModal.vue index cf72eac..a4e410e 100644 --- a/src/views/invoicing/nuInvoicingQgdInfo/components/NuInvoicingQgdInfoModal.vue +++ b/src/views/invoicing/qgdInfo/components/QgdInfoModal.vue @@ -6,7 +6,7 @@