From 0f88306304eac616ae08a491d316bc59e6c11094 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Fri, 14 Feb 2025 16:04:52 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E9=A3=8E=E6=A0=BC=E5=88=87?= =?UTF-8?q?=E6=8D=A2=EF=BC=8C=E5=93=81=E7=B1=BB=E5=93=81=E7=89=8C=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/basicdata/basicdataBrandCategory.js | 2 +- .../basicdata/ThreePartyMallManagement.js | 11 ++++++++ .../basicdata/basicdataBrandCategory.js | 14 ++++++++-- src/page/login/index.vue | 27 +++++++++---------- src/page/login/userlogin.vue | 2 +- src/styles/login.scss | 6 ++--- src/views/basicdata/brand/basicClient.vue | 4 +-- .../brand/basicdataBrandCategory.vue | 12 ++++++--- 8 files changed, 51 insertions(+), 27 deletions(-) diff --git a/src/api/basicdata/basicdataBrandCategory.js b/src/api/basicdata/basicdataBrandCategory.js index 61881ae8..aff1eb69 100644 --- a/src/api/basicdata/basicdataBrandCategory.js +++ b/src/api/basicdata/basicdataBrandCategory.js @@ -2,7 +2,7 @@ import request from '@/axios'; export const getList = (current, size, params) => { return request({ - url: '/api/logpm-basicdata/basicdataBrandCategory/list', + url: '/api/logpm-basicdata/basicdataBrandCategory/page', method: 'get', params: { ...params, diff --git a/src/option/basicdata/ThreePartyMallManagement.js b/src/option/basicdata/ThreePartyMallManagement.js index 9b9cfd8e..174241e5 100644 --- a/src/option/basicdata/ThreePartyMallManagement.js +++ b/src/option/basicdata/ThreePartyMallManagement.js @@ -69,6 +69,17 @@ export const columnList = [ sortable: true, head: false, }, + { + prop: 'createTime', + label: '创建时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, { prop: '', label: '操作', diff --git a/src/option/basicdata/basicdataBrandCategory.js b/src/option/basicdata/basicdataBrandCategory.js index 0eccbffa..3bbcd3cf 100644 --- a/src/option/basicdata/basicdataBrandCategory.js +++ b/src/option/basicdata/basicdataBrandCategory.js @@ -186,6 +186,17 @@ export default { ] }, { + label: "品类名称", + prop: "name", + addDisplay: false, + editDisplay: false, + viewDisplay: false, + }, + { + addDisplay: true, + editDisplay: true, + viewDisplay: true, + hide: true, label: "品类名称", prop: "categoryId", type: 'tree', @@ -213,7 +224,7 @@ export default { } if (level == 0) { - axios.get(`/api/logpm-basicdata/basicdataCategory/lazy-tree?parentId=1`).then(res => { + axios.get(`/api/logpm-basicdata/basicdataCategory/lazy-tree?parentId=1`).then(res => { list = res.data.data; callback() }) @@ -238,7 +249,6 @@ export default { callback() } } - }, { label: "标识", diff --git a/src/page/login/index.vue b/src/page/login/index.vue index 9880a6bf..e4ad52fe 100644 --- a/src/page/login/index.vue +++ b/src/page/login/index.vue @@ -14,9 +14,9 @@ --> - + - + @@ -241,18 +241,17 @@ export default { } -.login-left { +// .login-left { /* 新增 */ - box-sizing: border-box !important; - border: 1px solid #ebebeb !important; - background: #ffffff5c; - box-shadow: -1px -5px 8px #00000003; - backdrop-filter: blur(6px); + // box-sizing: border-box !important; + // border: 1px solid #ebebeb !important; + // background: #ffffff5c; + // box-shadow: -1px -5px 8px #00000003; + // backdrop-filter: blur(6px); + // img { + // width: 78%; + // height: 100%; + // } - img { - width: 78%; - height: 100%; - } - -} +// } diff --git a/src/page/login/userlogin.vue b/src/page/login/userlogin.vue index 2a84cd17..51a60c13 100644 --- a/src/page/login/userlogin.vue +++ b/src/page/login/userlogin.vue @@ -300,7 +300,7 @@ export default { if (data.success && data.data.tenantId) { this.tenantMode = false; this.loginForm.tenantId = data.data.tenantId; - // this.$parent.$refs.login.style.backgroundImage = `url(${data.data.backgroundUrl})`;//背景图 + this.$parent.$refs.login.style.backgroundImage = `url(${data.data.backgroundUrl})`;//背景图 } }); }, diff --git a/src/styles/login.scss b/src/styles/login.scss index 0f5622d6..3235e01f 100644 --- a/src/styles/login.scss +++ b/src/styles/login.scss @@ -5,15 +5,15 @@ width: 100%; height: 100%; margin: 0 auto; - // background-image: url('/img/bg/bg.jpg'); - background-image: url('https://www.v6g.cn/IMAGE/kg2.png'); + background-image: url('/img/bg/bg.jpg'); + // background-image: url('https://www.v6g.cn/IMAGE/kg2.png'); background-size: 100% 100%; } .login-weaper { margin: 0 auto; width: 1000px; - // box-shadow: 1px 1px 4px #d9d9d9; + box-shadow: 1px 1px 4px #d9d9d9; .el-input-group__append { border: none; diff --git a/src/views/basicdata/brand/basicClient.vue b/src/views/basicdata/brand/basicClient.vue index a32b66db..8ad97068 100644 --- a/src/views/basicdata/brand/basicClient.vue +++ b/src/views/basicdata/brand/basicClient.vue @@ -255,7 +255,7 @@ - + @@ -1876,6 +1876,6 @@ export default { position: absolute; } :deep(.el-select__wrapper){ - width: 120px; + width: 100%; } diff --git a/src/views/basicdata/brand/basicdataBrandCategory.vue b/src/views/basicdata/brand/basicdataBrandCategory.vue index 76a0f01a..bfff259d 100644 --- a/src/views/basicdata/brand/basicdataBrandCategory.vue +++ b/src/views/basicdata/brand/basicdataBrandCategory.vue @@ -98,6 +98,7 @@ }); }, rowUpdate(row, index, done, loading) { + console.log(row,'row'); update(row).then(() => { this.onLoad(this.page); this.$message({ @@ -156,8 +157,8 @@ categoryId, } = this.query; let values = { - brandId_like: brandId, - categoryId_like: categoryId, + brandName: brandId, + name: categoryId, }; this.$confirm("是否导出数据?", "提示", { confirmButtonText: "确定", @@ -214,15 +215,18 @@ } = this.query; let values = { - brandId_like: brandId, - categoryId_like: categoryId, + brandName: brandId, + name: categoryId, }; getList(page.currentPage, page.pageSize, values).then(res => { const data = res.data.data; + this.page.total = data.total; this.data = data.records; this.loading = false; + console.log(this.data,''); + this.selectionClear(); }); }