diff --git a/src/components/SimpleMenu/src/SimpleMenu.vue b/src/components/SimpleMenu/src/SimpleMenu.vue index ea4d228..173192b 100644 --- a/src/components/SimpleMenu/src/SimpleMenu.vue +++ b/src/components/SimpleMenu/src/SimpleMenu.vue @@ -196,24 +196,28 @@ .jeecg-menu-item-active:not(.jeecg-menu-submenu) { color: white !important; background-color: #1890ff !important; - border-radius: 5px; - margin: 10px 20px; - padding: 10px; + border-radius: 8px; + margin: 0px 20px 0 20px; +} + +.jeecg-menu-vertical .jeecg-menu-item:hover, .jeecg-menu-vertical .jeecg-menu-submenu-title:hover { + color: #fff !important; + border-radius: 8px; + background: #c9cacc; + margin: 10px 20px 0 20px; } -// .jeecg-menu { -// background: #fbfbfd; -// position: relative; -// display: block; -// width: 100%; -// padding: 0; -// margin: 0; -// font-size: 14px; -// color: rgba(0, 0, 0, 0.88); -// list-style: none; -// outline: none; -// border-radius: 5px; -// } .jeecg-menu-light.jeecg-menu-vertical .jeecg-menu-item-active.jeecg-menu-submenu { - background: #f0f0f0; + color: #606266 !important; + background: #f0f0f0; + +} +.jeecg-menu-vertical .jeecg-menu-item, .jeecg-menu-vertical .jeecg-menu-submenu-title { + position: relative; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + cursor: pointer; + margin-top: 10px; + padding: 8px; } diff --git a/src/components/Table/src/BasicTable.vue b/src/components/Table/src/BasicTable.vue index 3c6c9af..4fd6dfa 100644 --- a/src/components/Table/src/BasicTable.vue +++ b/src/components/Table/src/BasicTable.vue @@ -504,7 +504,7 @@ padding: 24px 10px 0px 10px; margin-bottom: 8px; background-color: @component-background; - border-radius: 5px; + border-radius: 8px; } } @@ -523,7 +523,7 @@ .ant-table-wrapper { padding: 6px; background-color: @component-background; - border-radius: 5px; + border-radius: 8px; .ant-table-title { min-height: 40px; @@ -624,4 +624,7 @@ } // update-end--author:liaozhiyang---date:20240604---for:【TV360X-377】关联记录必填影响到了table的输入框和页码样式 } + .ant-table-wrapper .ant-table.ant-table-middle .ant-table-tbody > tr > td{ + padding: 8px 8px; + } diff --git a/src/design/ant/btn.less b/src/design/ant/btn.less index fd4c9f4..3b961f0 100644 --- a/src/design/ant/btn.less +++ b/src/design/ant/btn.less @@ -7,9 +7,44 @@ // &.ant-btn-error:not(.ant-btn-link), // &.ant-btn-warning:not(.ant-btn-link), &.ant-btn-primary:not(.ant-btn-link) { - box-shadow: 0 2px 6px 0 rgba(0, 0, 0, 0.12), 0 2px 4px 0 rgba(0, 0, 0, 0.08) !important; - background: linear-gradient(to right, #1ea1fb, #0480e7); + // box-shadow: 0 2px 6px 0 rgba(0, 0, 0, 0.12), 0 2px 4px 0 rgba(0, 0, 0, 0.08) !important; + // background: linear-gradient(to right, #1ea1fb, #017de9); + + // align-items: center; + border-radius: 8px; + background: linear-gradient(to right,#1ea0fa , #017de9); + // border: 1px solid #fff; + // color: #fff; + // position: relative; /* needed for pseudo-element */ + overflow: hidden; /* clip the animated stripe */ + // height: 34px; } + &.ant-btn-primary:not(.ant-btn-link)::before { + content: ''; + position: absolute; + top: 0; + left: -100%; + width: 100%; + height: 100%; + background: linear-gradient( + 90deg, + transparent 0%, + rgba(255,255,255,0.4) 50%, + transparent 100% + ); + transform: skewX(0); + } + + &.ant-btn-primary:not(.ant-btn-link):hover::before { + animation: light-sweep 1.5s forwards; + } + + @keyframes light-sweep { + to { + left: 100%; + } + } + // &-group { // .ant-btn:not(:first-child) { // bottom: 1px; @@ -322,3 +357,51 @@ } } } + + +.ant-btn-default { + border-radius: 8px !important; + color: white; + background: linear-gradient(to right,#1ea0fa , #017de9); + border: 0px; +} +:where(.css-dev-only-do-not-override-9m98ij).ant-btn-default:not(:disabled):hover { + color: white; + border-color: white; +} +&.ant-btn-default:not(.ant-btn-link) { + border-radius: 8px; + color: white; + background: linear-gradient(to right,#1ea0fa , #017de9); + overflow: hidden; /* clip the animated stripe */ +} +&.ant-btn-default:not(:disabled):hover { + color: white; + border-color: #40a9ff; +} +&.ant-btn-default:not(.ant-btn-link)::before { + content: ''; + color: white; + position: absolute; + top: 0; + left: -100%; + width: 100%; + height: 100%; + background: linear-gradient( + 90deg, + transparent 0%, + rgba(255,255,255,0.4) 50%, + transparent 100% + ); + transform: skewX(0); +} + +&.ant-btn-default:not(.ant-btn-link):hover::before { + animation: light-sweep 1.5s forwards; +} + +@keyframes light-sweep { + to { + left: 100%; + } +} \ No newline at end of file diff --git a/src/settings/componentSetting.ts b/src/settings/componentSetting.ts index e33f342..54a8081 100644 --- a/src/settings/componentSetting.ts +++ b/src/settings/componentSetting.ts @@ -18,11 +18,11 @@ export default { totalField: 'total', }, // 可选的分页选项 - pageSizeOptions: ['10', '50', '80', '100'], + pageSizeOptions: ['15', '50', '80', '100'], // 表格默认尺寸 defaultSize: 'middle', //默认每页显示多少条 - defaultPageSize: 10, + defaultPageSize: 15, // 默认排序方法 defaultSortFn: (sortInfo: SorterResult) => { //update-begin-author:taoyan date:2022-10-21 for: VUEN-2199【表单设计器】多字段排序 diff --git a/src/views/biz/bizEmployeesInfo/BizEmployeesInfoList.vue b/src/views/biz/bizEmployeesInfo/BizEmployeesInfoList.vue index b9c91f9..0509403 100644 --- a/src/views/biz/bizEmployeesInfo/BizEmployeesInfoList.vue +++ b/src/views/biz/bizEmployeesInfo/BizEmployeesInfoList.vue @@ -24,7 +24,7 @@ - +
@@ -62,47 +62,6 @@ - - -
@@ -310,7 +269,7 @@ function onPageChange(page,pageSize){ .cardClass{ margin: 5px; // 添加向右下的阴影效果 - border-radius: 5px; + border-radius: 8px; transition: box-shadow 0.3s ease-in-out; box-shadow: 0 2px 4px rgba(0, 0, 0, 0.12), 0 0 6px rgba(0, 0, 0, 0.04); diff --git a/src/views/biz/bizEmployeesInfo/employeesServiceTag/EmployeesServiceTagForm.vue b/src/views/biz/bizEmployeesInfo/employeesServiceTag/EmployeesServiceTagForm.vue index b7fce48..dac9c89 100644 --- a/src/views/biz/bizEmployeesInfo/employeesServiceTag/EmployeesServiceTagForm.vue +++ b/src/views/biz/bizEmployeesInfo/employeesServiceTag/EmployeesServiceTagForm.vue @@ -73,6 +73,7 @@ import { defHttp } from '/@/utils/http/axios'; const employeesDataSource = ref([]); const tagsDetailData = ref([]); const employeesInfo = reactive({}); + const emit = defineEmits(['register', 'ok']); //注册model const [registerModal, {openModal}] = useModal(); //注册table数据 @@ -191,11 +192,15 @@ import { defHttp } from '/@/utils/http/axios'; reload(); getEmployessServiceTagsList(); } + function submitForm(){ + emit('ok'); + } defineExpose({ init, + submitForm }); diff --git a/src/views/biz/nuBizCustomerInfo/NuBizCustomerInfoList.vue b/src/views/biz/nuBizCustomerInfo/NuBizCustomerInfoList.vue index fab7ea3..c7b046e 100644 --- a/src/views/biz/nuBizCustomerInfo/NuBizCustomerInfoList.vue +++ b/src/views/biz/nuBizCustomerInfo/NuBizCustomerInfoList.vue @@ -30,7 +30,7 @@ - +
@@ -297,7 +297,7 @@ .cardClass{ margin: 5px; // 添加向右下的阴影效果 - border-radius: 5px; + border-radius: 8px; transition: box-shadow 0.3s ease-in-out; box-shadow: 0 2px 4px rgba(0, 0, 0, 0.12), 0 0 6px rgba(0, 0, 0, 0.04); diff --git a/src/views/invoicing/ConfigMaterial/ConfigMaterialInfo.data.ts b/src/views/invoicing/ConfigMaterial/ConfigMaterialInfo.data.ts index ce692fd..a51f13b 100644 --- a/src/views/invoicing/ConfigMaterial/ConfigMaterialInfo.data.ts +++ b/src/views/invoicing/ConfigMaterial/ConfigMaterialInfo.data.ts @@ -55,18 +55,18 @@ export const columns: BasicColumn[] = [ align: "center", dataIndex: 'medicationId_dictText' }, - { - title: '物料图片', - align: "center", - dataIndex: 'materialImg', - customRender: render.renderImage, - }, - { - title: '物料标识', - align: "center", - dataIndex: 'materialIdent', - customRender: render.renderImage, - }, + // { + // title: '物料图片', + // align: "center", + // dataIndex: 'materialImg', + // customRender: render.renderImage, + // }, + // { + // title: '物料标识', + // align: "center", + // dataIndex: 'materialIdent', + // customRender: render.renderImage, + // }, { title: '是否启用', align: "center", diff --git a/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue b/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue index 798896e..68003de 100644 --- a/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue +++ b/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue @@ -74,7 +74,7 @@ - +
· {{item3.title}}
diff --git a/src/views/invoicing/configSuppliersInfo/ConfigSuppliersInfo.data.ts b/src/views/invoicing/configSuppliersInfo/ConfigSuppliersInfo.data.ts index 4323b65..0bfdd6d 100644 --- a/src/views/invoicing/configSuppliersInfo/ConfigSuppliersInfo.data.ts +++ b/src/views/invoicing/configSuppliersInfo/ConfigSuppliersInfo.data.ts @@ -50,12 +50,12 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'wechartId' }, - { - title: '资质照片', - align:"center", - dataIndex: 'imgPath', - customRender:render.renderImage, - }, + // { + // title: '资质照片', + // align:"center", + // dataIndex: 'imgPath', + // customRender:render.renderImage, + // }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ diff --git a/src/views/invoicing/configSuppliersInfo/ConfigSuppliersInfoList.vue b/src/views/invoicing/configSuppliersInfo/ConfigSuppliersInfoList.vue index 58997bc..65215c1 100644 --- a/src/views/invoicing/configSuppliersInfo/ConfigSuppliersInfoList.vue +++ b/src/views/invoicing/configSuppliersInfo/ConfigSuppliersInfoList.vue @@ -1,5 +1,38 @@