From 2d23d9c9d26a5b0ef65ec79b30ab12052b85b23c Mon Sep 17 00:00:00 2001 From: Zhao Qiqi <1287235164@qq.com> Date: Tue, 26 Jul 2022 09:06:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=82=E5=95=86=E3=80=81=E7=BB=8F=E9=94=80?= =?UTF-8?q?=E5=95=86=E3=80=81=E5=93=81=E7=89=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui-base-ui/src/styles/index.scss | 154 ++++- .../changshangguanli/changshangguanli.vue | 10 +- .../changshangguanli/changshangguanliAdd.vue | 40 +- .../changshangguanli/changshanglook.vue | 133 +--- .../relation/changshangBankInfo.vue | 2 +- .../guakaogongsiguanli/guakaogongsiInfo.vue | 1 - .../guakaogongsiguanli/guakaogongsiguanli.vue | 14 +- .../views/pinpai/pinpaiguanli/pinpaiAdd.vue | 66 +- .../views/pinpai/pinpaiguanli/pinpaiInfo.vue | 19 +- .../pinpai/pinpaiguanli/pinpaiguanli.vue | 566 +++++++++--------- 10 files changed, 531 insertions(+), 474 deletions(-) diff --git a/anrui-base/anrui-base-ui/src/styles/index.scss b/anrui-base/anrui-base-ui/src/styles/index.scss index be61818c68..383090e1d2 100644 --- a/anrui-base/anrui-base-ui/src/styles/index.scss +++ b/anrui-base/anrui-base-ui/src/styles/index.scss @@ -102,7 +102,7 @@ div:focus { font-size: 20px; } -// 页面上的button按钮的样式 +// 页面上的button按钮 .app-container { .el-button--medium { padding: 10px 14px; @@ -110,7 +110,7 @@ div:focus { } .el-button--small { - padding: 7px 12px; + padding: 8px 12px; font-size: 14px; } @@ -146,6 +146,15 @@ div:focus { overflow-x: hidden; } +// 新增编辑、详情页面的标题样式 +.listconadd{ + .titwu { + font-size: 28px; + text-align: center; + padding: 30px 0 20px 0; + } +} + .listconsub { height: calc(100vh - 310px); overflow-y: auto; @@ -236,51 +245,122 @@ div:focus { margin-right: 4px; } .formadd { - padding: 88px 40px 0 40px; + padding: 10px 40px 0 40px; font-size: 16px; // height: calc(100vh - 200px);overflow-y: auto; - .title { - padding: 12px;font-weight: bold; + .title { + padding: 12px; + font-weight: bold; font-size: 16px; background-color: $header-bg; text-align: left; color: #ffffff; - } + } + .el-row { - display:flex; - flex-wrap: wrap; - border-left: 1px solid $table-border-color; - .el-col{ - border-right: 1px solid $table-border-color; - border-bottom: 1px solid $table-border-color; - padding: 0 15px; - min-height: 42px; - line-height: 1; - .el-form-item{ - margin-bottom: 0; + display: flex; + flex-wrap: wrap; + border-left: 1px solid $table-border-color; + .el-col { + border-right: 1px solid $table-border-color; + border-bottom: 1px solid $table-border-color; + padding: 0 15px; + min-height: 42px; + line-height: 1; + + .el-form-item { + margin-bottom: 0; + line-height: 42px; + // .addinputw{width: 400px;} + .addinputw { + width: 80%; line-height: 42px; - // .addinputw{width: 400px;} - .addinputw{width: 80%;line-height: 42px;} - .el-input__inner { - height: 36px; - } + } + .el-input__inner { + height: 36px; } } - - } - .footer{margin: 20px;} + } + } + .footer{margin: 20px;} } +.formaddcopy02 { + padding: 10px 40px 0 40px; + .title { + padding: 12px; + font-weight: bold; + font-size: 16px; + background-color: #0294d7; + color: #ffffff; + text-align: left; + } + + .el-row { + display: flex; + flex-wrap: wrap; + border-left: 1px solid $table-border-color; + + .el-col { + border-right: 1px solid $table-border-color; + border-bottom: 1px solid $table-border-color; + min-height: 42px; + padding: 0 15px; + line-height: 42px; + position: relative; + .span-sty { + position: absolute; + top: 0; + bottom: 0; + left: 0; + line-height: 42px; + text-align: right; + font-size: 14px; + color: #606266; + font-weight: 600; + width: 70px; + padding-right: 5px; + border-right: 1px solid #e0e3eb; + } + + .el-form-item { + margin-bottom: 0; + line-height: 42px; + .addinputw { + //padding: 5px 0; + width: 65%; + margin-left: 80px; + line-height: 42px; + } + + .addinputInfo { + margin-left: 80px; + line-height: 42px; + } + + .el-input__inner { + height: 36px; + } + } + } + + } + + .footer { + margin: 20px; + } +} .forminfo { - padding: 20px 0; - .title { - padding: 10px;font-weight: bold; - font-size: 20px; - background-color: $header-bg; - text-align: center; + padding: 10px 40px 0 40px; + .title { + padding: 12px; + font-weight: bold; + font-size: 16px; + background-color: #0294d7; color: #ffffff; - } + text-align: left; + } .el-row { display:flex; flex-wrap: wrap; @@ -309,6 +389,16 @@ div:focus { z-index: 100; } .bluezi{color: $header-bg;cursor:pointer;} +// 隐藏显示按钮 +.main-content { + .searchcon { + .searchbtn { + margin: 5px 0; + border: #2cab69 1px solid; + color: #2cab69; + } + } +} // 经销商添加样式 .titcon{ display: flex; diff --git a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanli.vue b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanli.vue index b28863f10f..f28f1ac03a 100644 --- a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanli.vue +++ b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanli.vue @@ -59,7 +59,7 @@ 编辑 - + @@ -175,28 +175,28 @@ export default { btnList: [ { type: 'primary', - size: 'medium', + size: 'small', icon: 'plus', btnKey: 'toAdd', btnLabel: '新增' }, { type: 'danger', - size: 'medium', + size: 'small', icon: 'del', btnKey: 'doDel', btnLabel: '删除' }, { type: 'success', - size: 'medium', + size: 'small', icon: 'export', btnKey: 'build', btnLabel: '导出' }, { type: 'info', - size: 'medium', + size: 'small', icon: 'cross', btnKey: 'doClose', btnLabel: '关闭' diff --git a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanliAdd.vue b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanliAdd.vue index 333f0fd01f..872bce979a 100644 --- a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanliAdd.vue +++ b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanliAdd.vue @@ -7,9 +7,9 @@
【修改】厂商信息
- 保存 - 提交 - 返回 + 保存 + 提交 + 返回
@@ -453,7 +453,7 @@ import {details, SaveList, selectListOrg, Update,} from "@/api/jichuxinxi/basema import {getCity, getCounty, getProvince} from '@/api/portal/areaPicker' // 省市区 import {typeValues} from "@/api/jichuxinxi/dictcommons"; import {getLook, getXiu, setuser} from "@/utils/baocun"; -import {fetchBySid, getListOrg, getPathSidByUserSid} from "@/api/jichuxinxi/brandManagement"; +import {getListOrg} from "@/api/jichuxinxi/brandManagement"; import changshangBankInfo from "@/views/changshang/changshangguanli/relation/changshangBankInfo"; export default { @@ -852,20 +852,20 @@ export default { this.temp1.taxClassificationValue = bb.name }, // 根据登陆人sid获取分公司 - getPathSid() { - const userSid = window.sessionStorage.getItem('userSid') - getPathSidByUserSid({userSid:userSid}).then((res) => { - if (res.code === '200') { - // this.temp.createOrgName = res - this.temp.createOrg = res.data - fetchBySid(res.data).then((response) => { - if (response.code === '200') { - this.temp.createOrgName = response.data.name - } - }) - } - }) - }, + // getPathSid() { + // const userSid = window.sessionStorage.getItem('userSid') + // getPathSidByUserSid({userSid:userSid}).then((res) => { + // if (res.code === '200') { + // // this.temp.createOrgName = res + // this.temp.createOrg = res.data + // fetchBySid(res.data).then((response) => { + // if (response.code === '200') { + // this.temp.createOrgName = response.data.name + // } + // }) + // } + // }) + // }, // 查询所有分公司 getListOrgAll() { getListOrg().then((res) => { @@ -969,7 +969,7 @@ export default { this.getZuZhi(); this.huoquSheng() this.getListOrgAll() - this.getPathSid() + // this.getPathSid() }, init() { @@ -1136,7 +1136,7 @@ export default { this.getZuZhi(); this.huoquSheng() this.getListOrgAll() - this.getPathSid() + // this.getPathSid() }, // 返回 handleReturn(isreload) { diff --git a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshanglook.vue b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshanglook.vue index 9224110512..5acddedc1e 100644 --- a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshanglook.vue +++ b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshanglook.vue @@ -4,7 +4,7 @@
厂商管理详情
- 返回 + 返回
@@ -41,8 +41,8 @@ 分类 - - {{temp.supplierType}} + + {{temp.supplierTypeValue}} @@ -294,108 +294,26 @@ -
供应厂商开户行信息
- - - 国家 - - - - {{temp2.country}} - - - - 开户银行 - - - - {{temp2.depositBank}} - - - - - - 银行账号 - - - - {{temp2.bankAccount}} - - - - 账户名称 - - - - {{temp2.accountName}} - - - - - - 收款银行 - - - - {{temp2.dueBank}} - - - - 银行网点 - - - - {{temp2.bankingOutlets}} - - - - - - 开户行地址 - - - - {{temp2.bankAddress}} - - - - 联行号 - - - - {{temp2.paymentLines}} - - - - - - Swiftcode(银行代码) - - - - {{temp2.swiftCode}} - - - - 币种 - - - - {{temp2.currency}} - - - - - - 描述 - - - - {{temp2.remarks}} - - - - +
+
开户行信息
+
+ 新增 + +
+
+ + + + + + + + + + + + +
@@ -431,6 +349,9 @@ export default { update: "修改", create: "创建", }, + tableKey: 0, + index: 0, + list:[], temp:{}, temp1:{}, temp2:{}, @@ -515,7 +436,7 @@ export default { this.temp1 = response.data.baseManufacturerFinanceDto } if (response.data.baseManufacturerBankDto) { - this.temp2 = response.data.baseManufacturerBankDto + this.list = response.data.baseManufacturerBankDto } } }) diff --git a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/relation/changshangBankInfo.vue b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/relation/changshangBankInfo.vue index 43eb11f802..2ce0fd45a5 100644 --- a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/relation/changshangBankInfo.vue +++ b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/relation/changshangBankInfo.vue @@ -160,7 +160,7 @@ export default { methods: { getType() { // typeValues({ - type: 'receiptBank' + type: 'dueBank' }).then((res) => { if (res.success) { this.receiptBank_list = res.data diff --git a/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiInfo.vue b/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiInfo.vue index 757b76d67c..b3761b19ec 100644 --- a/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiInfo.vue +++ b/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiInfo.vue @@ -4,7 +4,6 @@
经销商详情
- 下载 返回
diff --git a/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiguanli.vue b/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiguanli.vue index 95d4a302d3..5be6aa2211 100644 --- a/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiguanli.vue +++ b/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiguanli.vue @@ -53,8 +53,8 @@
- 查询 - 重置 + 查询 + 重置
@@ -75,7 +75,7 @@ @selection-change="handleSelectionChange"> - +