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 d376d7b..fe3d041 100644 --- a/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue +++ b/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue @@ -19,7 +19,7 @@ - + --> @@ -28,12 +28,6 @@ - - - - - - @@ -42,10 +36,16 @@ - + + + + + + + @@ -57,38 +57,71 @@ - - -
- - - - +
+
+
+
+
+
+ + {{ item.title }} +
+
+
+
+
+
+ + + +
+
- - - - - - - - - - - - +
+ + + + + + + + +
+ +
+ + + @@ -111,6 +144,7 @@ import type { TreeProps } from 'ant-design-vue'; import { DownOutlined } from '@ant-design/icons-vue'; import { defHttp } from '/@/utils/http/axios'; +import type { CollapseProps } from 'ant-design-vue'; const formRef = ref(); const queryParam = reactive({}); @@ -118,6 +152,40 @@ import { defHttp } from '/@/utils/http/axios'; const registerModal = ref(); const userStore = useUserStore(); let treeData = ref([]); + let treeChildData = ref([]); + const activeKey = ref(0); + const activeKey2 = ref(0); + const rootSubmenuKeys= ['sub1'] + const openKeys= [] + const selectedKeys= [] + const clickCount = ref(0); + /** + * 点击菜单 + * @param index 菜单索引 + * @param lengths 菜单数量 + * @param item 菜单数据 + */ +const handleClick = (index,item) => { + clickCount.value = index; + treeChildData.value = item.children; + +}; +const getCardStyle = (index,allSize) => { + const style = {borderBottomLeftRadius:'',borderTopLeftRadius:''}; + if (clickCount.value - 1 === index) { + style.borderBottomLeftRadius = '5px'; + } + if (clickCount.value + 1 === index) { + style.borderTopLeftRadius= '5px'; + } + if(!index){ + style.borderTopLeftRadius= '5px'; + } + if(index === allSize){ + style.borderBottomLeftRadius= '5px'; + } + return style; +}; //注册table数据 const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ tableProps: { @@ -157,9 +225,20 @@ import { defHttp } from '/@/utils/http/axios'; sm: 20, }); - function onSelect(ids, e) { - let id = ids[0]; - queryParam.treeId =id; + function onOpenChange (openKeys: string[]){ + const latestOpenKey = openKeys.find(key => openKeys.indexOf(key) === -1); + if (rootSubmenuKeys.indexOf(latestOpenKey!) === -1) { + openKeys = openKeys; + } else { + openKeys = latestOpenKey ? [latestOpenKey] : []; + } + }; + + function onSelect({ key, domEvent }) { + // console.log(ids); + // console.log(e); + // let id = ids[0]; + queryParam.treeId =key; reload(); } /** @@ -264,8 +343,14 @@ import { defHttp } from '/@/utils/http/axios'; // 自动请求并暴露内部方法 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) + if(treeData.value.length > 0){ + treeChildData.value = treeData.value[0].children; + } + }) }); @@ -296,4 +381,67 @@ import { defHttp } from '/@/utils/http/axios'; width: 100%; } } + + .all-card { + width: 80px; + height: 730px; + // background-color: rgb(217, 230, 239); + // display: flex; + /* justify-content: flex-end; */ + align-items: flex-end; + flex-direction: column; + // padding-top: 10px; +} + +.card { + display: flex; + justify-content: center; + align-items: center; + width: 80px; + height: 120px; + flex-direction: column; + background-color: rgb(243, 248, 251); + /* border-radius: 25px; */ +} + +.card-target { + display: flex; + justify-content: center; + align-items: center; + width: 80px; + height: 120px; + flex-direction: column; + background-color: #fff; + border-top-left-radius: 30px; + border-bottom-left-radius: 30px; + /* position: relative; */ + /* border-radius: 10px; */ +} + +.sanjiao-down { + position: absolute; + bottom: -26px; + left: 17px; + width: 64px; + /* 上边长度 */ + height: 27px; + /* 右边长度 */ + background-color: #fff; + /* 三角形填充色 */ + /* 三点依次为:右上 (100% 0),右下 (100% 100%),左上 (0 0) */ + clip-path: polygon(100% 0, 100% 100%, 0 0); + z-index: 999; +} + +.sanjiao-up { + position: absolute; + top: -26px; + left: 17px; + width: 64px; + height: 27px; + background-color: #fff; + /* 三点依次为:右下 (100% 100%),左下 (0 100%),右上 (100% 0) */ + clip-path: polygon(100% 100%, 0 100%, 100% 0); + z-index: 999; +} 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/system/loginmini/MiniLogin.vue b/src/views/system/loginmini/MiniLogin.vue index 8ad97fc..669dac3 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; +} diff --git a/src/views/system/loginmini/MiniLogin_yunwei.vue b/src/views/system/loginmini/MiniLogin_yunwei.vue index f3a6556..2319596 100644 --- a/src/views/system/loginmini/MiniLogin_yunwei.vue +++ b/src/views/system/loginmini/MiniLogin_yunwei.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; +} diff --git a/src/views/system/loginmini/MiniLogin_yunying.vue b/src/views/system/loginmini/MiniLogin_yunying.vue index 8ad97fc..669dac3 100644 --- a/src/views/system/loginmini/MiniLogin_yunying.vue +++ b/src/views/system/loginmini/MiniLogin_yunying.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; +}