diff --git a/src/assets/images/iconDoc.png b/src/assets/images/iconDoc.png new file mode 100644 index 0000000..c25874e Binary files /dev/null and b/src/assets/images/iconDoc.png differ diff --git a/src/assets/images/iconMove.png b/src/assets/images/iconMove.png new file mode 100644 index 0000000..9b977a9 Binary files /dev/null and b/src/assets/images/iconMove.png differ diff --git a/src/assets/images/iconOther.png b/src/assets/images/iconOther.png new file mode 100644 index 0000000..8eb5e06 Binary files /dev/null and b/src/assets/images/iconOther.png differ diff --git a/src/assets/images/iconPdf.png b/src/assets/images/iconPdf.png new file mode 100644 index 0000000..5850c77 Binary files /dev/null and b/src/assets/images/iconPdf.png differ diff --git a/src/assets/images/iconPpt.png b/src/assets/images/iconPpt.png new file mode 100644 index 0000000..72725ed Binary files /dev/null and b/src/assets/images/iconPpt.png differ diff --git a/src/assets/images/iconTxt.png b/src/assets/images/iconTxt.png new file mode 100644 index 0000000..df6c519 Binary files /dev/null and b/src/assets/images/iconTxt.png differ diff --git a/src/assets/images/iconVideo.png b/src/assets/images/iconVideo.png new file mode 100644 index 0000000..bb67174 Binary files /dev/null and b/src/assets/images/iconVideo.png differ diff --git a/src/assets/images/iconXls.png b/src/assets/images/iconXls.png new file mode 100644 index 0000000..44b258e Binary files /dev/null and b/src/assets/images/iconXls.png differ diff --git a/src/assets/images/iconZip.png b/src/assets/images/iconZip.png new file mode 100644 index 0000000..995a73b Binary files /dev/null and b/src/assets/images/iconZip.png differ diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss index 6ece4dd..53bcbc8 100644 --- a/src/assets/styles/ruoyi.scss +++ b/src/assets/styles/ruoyi.scss @@ -340,6 +340,11 @@ h6 { // text-align: right; } +.my_form_row { + padding: 0px; + margin: 0px; +} + // 按钮样式 .el-message-box__btns .el-button--primary { /* 修改确认按钮样式 */ @@ -673,6 +678,7 @@ h6 { .searchInputForm .el-form-item--default { margin-bottom: 0px; } + .searchInputForm .el-input__inner { font-family: Microsoft YaHei; font-weight: 400; @@ -791,11 +797,56 @@ h6 { font-weight: 700; font-size: 18px; color: #000000; - border-bottom: 1px solid #DCDCDC; + border-bottom: 1px solid #D4DAE1; box-sizing: border-box; padding: 20px 30px !important; } +.el-card__footer { + height: 74px; + text-align: center; +} + +.myFormCard .el-card__body { + padding: 30px 126px !important; + overflow-y: auto; + width: 100%; + height: calc(100vh - 240px); +} + +.myDetailCard .el-card__body { + padding: 30px 30px 0 30px !important; + overflow-y: auto; + width: 100%; + height: calc(100vh - 165px); +} +.myDetailCard .el-table .el-table__header-wrapper th, .el-table .el-table__fixed-header-wrapper th{ + background: #ffffff !important; +} +.myDetailCard .el-table thead th { + font-weight: 400; +} +.myDetailCard .el-table .el-table__cell { + color: #000000 !important; +} + +.submitBtn { + width: 120px; + height: 34px; + border-radius: 4px 4px 4px 4px; + background: #1a75e6; + font-family: Microsoft YaHei; + font-weight: 400; + font-size: 16px; + text-align: center; + color: #FFFFFF; + padding: 10px 28px 10px 28px; +} + +.submitBtn:hover { + background: #1a75e6; +} + .subHeaderTitle { font-family: Microsoft YaHei; font-weight: 400; @@ -863,6 +914,10 @@ h6 { // min-width: 34px; } +.my_form_label .el-form-item__label { + line-height: 16px; +} + // 文本输入框样式 .myInsertForm .el-input__inner { font-family: Microsoft YaHei; @@ -886,25 +941,6 @@ h6 { color: #B8B8B8; } -.myInsertForm .el-input__wrapper { - // background-color: transparent; - // border-radius: 0; - // box-shadow: none; - // padding: 0; -} - -// 选择框样式 -.myInsertForm .el-select__wrapper { - // background-color: transparent; - // border-radius: 0; - // box-shadow: none; - // padding: 0; -} - -.myInsertForm .el-select__wrapper.is-hovering:not(.is-focused) { - // box-shadow: none; -} - .myInsertForm .el-select__placeholder { font-family: Microsoft YaHei; font-weight: 400; @@ -964,6 +1000,43 @@ h6 { color: #B8B8B8; } +.myDetailForm .el-form-item--default { + margin-bottom: 0px; +} + +.myDetailForm .el-form--inline .el-form-item { + display: inline-flex; + margin-right: 26px; + vertical-align: middle; +} + +.myDetailForm .el-form-item__content { + font-family: Microsoft YaHei; + font-weight: 400; + font-size: 16px; + color: #1E1E1E; + display: block; + line-height: 60px; + padding-left: 30px; +} + +.myDetailForm .el-form-item__label { + font-family: Microsoft YaHei; + font-weight: 400; + font-size: 16px; + color: #002866; + justify-content: start; + height: 60px; + line-height: 60px; + padding-left: 31px; + background: #EDF2F960; +} + +.my_detailform_label .el-form-item__label { + line-height: 20px; + padding-top: 10px; +} + .myFeedBackForm .el-form-item__label { font-family: Microsoft YaHei; font-weight: 600; @@ -978,9 +1051,47 @@ h6 { font-size: 16px; color: #525252; } + .myFeedBackForm .el-textarea__inner::placeholder { font-family: Microsoft YaHei; font-weight: 400; font-size: 16px; color: #87898E !important; +} + +// 折叠面板样式 +.my-collapse .el-collapse-item__header .el-collapse-item__arrow { + display: none !important; +} + +.my-collapse { + border: none; +} + +.my-collapse .el-collapse-item { + margin-bottom: 20px; +} + +.my-collapse .is-active { + margin-bottom: 0px; +} + +.my-collapse .el-collapse-item__content { + padding-bottom: 0; +} + +.my-collapse .el-collapse-item__wrap { + border-bottom: none; +} + +.my-collapse .el-collapse-item__header { + height: 30px; + background-color: #1a75e630; + border: none; + border-bottom: none; + font-family: Microsoft YaHei; + font-weight: 600; + font-size: 18px; + color: #000000; + padding: 6px 20px; } \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 07302ad..cdb15d0 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -88,6 +88,21 @@ export const constantRoutes = [ // 动态路由,基于用户权限动态去加载 export const dynamicRoutes = [ + + // { + // path: '/supplierForm', + // component: Layout, + // hidden: true, + // permissions: ['supplier:add'], + // children: [ + // { + // path: ':Id(\\d+)?', + // component: () => import('@/views/supplier/supplierForm'), + // name: 'supplierForm', + // meta: { title: '供应商信息表单', activeMenu: '/supplier' } + // } + // ] + // }, { path: '/system/user-auth', component: Layout, diff --git a/src/views/supplier/index.vue b/src/views/supplier/index.vue index 20be057..1831121 100644 --- a/src/views/supplier/index.vue +++ b/src/views/supplier/index.vue @@ -1,165 +1,242 @@ \ No newline at end of file + + \ No newline at end of file diff --git a/src/views/supplier/supplierDetail.vue b/src/views/supplier/supplierDetail.vue new file mode 100644 index 0000000..ffe76eb --- /dev/null +++ b/src/views/supplier/supplierDetail.vue @@ -0,0 +1,366 @@ + + + \ No newline at end of file diff --git a/src/views/supplier/supplierForm.vue b/src/views/supplier/supplierForm.vue new file mode 100644 index 0000000..1838c30 --- /dev/null +++ b/src/views/supplier/supplierForm.vue @@ -0,0 +1,593 @@ + + + \ No newline at end of file