diff --git a/anrui-base/anrui-base-ui/src/App.vue b/anrui-base/anrui-base-ui/src/App.vue index c65a59abd6..6886de05f3 100644 --- a/anrui-base/anrui-base-ui/src/App.vue +++ b/anrui-base/anrui-base-ui/src/App.vue @@ -8,7 +8,7 @@ export default { name: 'App', mounted() { - + }, } diff --git a/anrui-base/anrui-base-ui/src/components/ButtonBar/index.vue b/anrui-base/anrui-base-ui/src/components/ButtonBar/index.vue index ff2cf3743f..2ef1a138ab 100644 --- a/anrui-base/anrui-base-ui/src/components/ButtonBar/index.vue +++ b/anrui-base/anrui-base-ui/src/components/ButtonBar/index.vue @@ -6,7 +6,7 @@
+ @click="btnHandle(item.btnKey)" > {{ item.btnLabel }} diff --git a/anrui-base/anrui-base-ui/src/styles/anrui-button.scss b/anrui-base/anrui-base-ui/src/styles/anrui-button.scss index eed676cfe6..c3c7b3c8e9 100644 --- a/anrui-base/anrui-base-ui/src/styles/anrui-button.scss +++ b/anrui-base/anrui-base-ui/src/styles/anrui-button.scss @@ -2,13 +2,13 @@ padding: 10px 14px; font-size: 16px; } - - .el-button--small { + + .btn-small { padding: 7px 12px; font-size: 14px; } - - .el-button--mini { + + .btn-mini { padding: 5px 10px; font-size: 12px; - } \ No newline at end of file + } diff --git a/anrui-base/anrui-base-ui/src/styles/index.scss b/anrui-base/anrui-base-ui/src/styles/index.scss index e0f46a85a2..c4d8bf7efe 100644 --- a/anrui-base/anrui-base-ui/src/styles/index.scss +++ b/anrui-base/anrui-base-ui/src/styles/index.scss @@ -7,7 +7,6 @@ @import './e-table.scss'; @import './element-table.scss'; @import './element-tabs.scss'; -@import './anrui-button.scss'; body { height: 100%; -moz-osx-font-smoothing: grayscale; @@ -87,32 +86,78 @@ div:focus { color: red !important; } -.pd-b10{ +.pd-b10 { padding-bottom: 10px; } -.pd-y40{ +.pd-y40 { padding: 40px 0; } -.pd-y20{ + +.pd-y20 { padding: 20px 0; } -.fs20{ +.fs20 { font-size: 20px; } +// 页面上的button按钮 +.app-container { + .el-button--medium { + padding: 10px 14px; + font-size: 16px; + } + + .el-button--small { + padding: 7px 12px; + font-size: 14px; + } + + .el-button--mini { + padding: 7px 10px; + font-size: 12px; + } +} + // 添加样式 .app-container { margin: 5px 0 5px 0; background-color: #fff; } + // 设置了滚动区域 -.main-content{ overflow-x: hidden;overflow-y: auto;height: calc(100vh - 186px);padding: 0 20px} -.listcon{height: calc(100vh - 425px);overflow-y: hidden;overflow-x: hidden;} -.listconadd{height: calc(100vh - 200px);overflow-y: auto;overflow-x: hidden;} -.listconsub{height: calc(100vh - 310px);overflow-y: auto;overflow-x: hidden;} -.listconsubjxs{height: calc(100vh - 300px);overflow-y: auto;overflow-x: hidden;} +.main-content { + overflow-x: hidden; + overflow-y: auto; + height: calc(100vh - 186px); + padding: 0 20px +} + +.listcon { + height: calc(100vh - 425px); + overflow-y: hidden; + overflow-x: hidden; +} + +.listconadd { + height: calc(100vh - 200px); + overflow-y: auto; + overflow-x: hidden; +} + +.listconsub { + height: calc(100vh - 310px); + overflow-y: auto; + overflow-x: hidden; +} + +.listconsubjxs { + height: calc(100vh - 300px); + overflow-y: auto; + overflow-x: hidden; +} + // 搜索的 .webtop { // position: fixed;top: 110px;width: calc(100% - 240px);z-index: 6000; @@ -120,7 +165,8 @@ div:focus { display: flex !important; flex-direction: row; justify-content: space-between !important; - align-items: center; margin-bottom: 0px !important; + align-items: center; + margin-bottom: 0 !important; font-size: 20px; } .tab-header { 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 f9739cd46f..077d24b8d6 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 @@ -1,6 +1,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 2037394c60..033eea3b3e 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 @@ -70,74 +70,73 @@
-
+
- - - + + + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/anrui-base/anrui-base-ui/src/views/pinpai/pinpaiguanli/pinpaiAdd.vue b/anrui-base/anrui-base-ui/src/views/pinpai/pinpaiguanli/pinpaiAdd.vue index b9721c04c3..43aaddedd8 100644 --- a/anrui-base/anrui-base-ui/src/views/pinpai/pinpaiguanli/pinpaiAdd.vue +++ b/anrui-base/anrui-base-ui/src/views/pinpai/pinpaiguanli/pinpaiAdd.vue @@ -204,10 +204,10 @@ export default { }, created() { // 初始化变量 - this.init() this.geTName() this.getZuZhi() this.getListOrgAll() + this.init() // 加载列表 // this.getList() }, @@ -346,7 +346,7 @@ export default { // 厂商 geTName() { namesDown({ - name: this.temp.manufacturerSid + name: '' }).then((res) => { if (res.code === '200') { this.supplierType = res.data diff --git a/anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js b/anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js index e77eb9c188..7c7e740e4c 100644 --- a/anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js +++ b/anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js @@ -25,7 +25,8 @@ export function getListOrg(data) { params: data }) } -// 根据登陆人sid查询分公司sid + +// 根据登陆人sid查询分公司 (孟哲写的接口) export function getPathSidByUserSid(data) { return request({ url: '/portal/v1/sysstafforg/getPathSidByUserSid', @@ -40,6 +41,7 @@ export function fetchBySid(sid) { method: 'get' }) } + // 根据当前登录用户的sid和分公司sid获取本分公司下除去当前用户的其余用户信息 export function getUserByOrgSid(data) { return request({ diff --git a/anrui-scm/anrui-scm-ui/src/components/pagination/index.vue b/anrui-scm/anrui-scm-ui/src/components/pagination/index.vue index 6458cc1d16..29d8bc8c8f 100644 --- a/anrui-scm/anrui-scm-ui/src/components/pagination/index.vue +++ b/anrui-scm/anrui-scm-ui/src/components/pagination/index.vue @@ -110,6 +110,12 @@ export default { .pagination-container.hidden { display: none; } +.el-pagination { + white-space: nowrap; + color: #303133; + font-weight: bold; + height: 28px; +} .el-pagination.is-background .btn-next, .el-pagination.is-background .btn-prev{ padding: 0 20px; border: 1px solid #ccc; diff --git a/anrui-scm/anrui-scm-ui/src/components/tab-search/index.vue b/anrui-scm/anrui-scm-ui/src/components/tab-search/index.vue index f58c63cb3a..5080af0072 100644 --- a/anrui-scm/anrui-scm-ui/src/components/tab-search/index.vue +++ b/anrui-scm/anrui-scm-ui/src/components/tab-search/index.vue @@ -38,9 +38,8 @@ .tab-header { background-color: $search-bg; padding: 8px 20px; - margin-bottom: 15px; .tab-search{ - padding: 8px 0px; + padding: 9px 0px; } .tab-btn{ .search-from{ diff --git a/anrui-scm/anrui-scm-ui/src/layout/components/AppMain.vue b/anrui-scm/anrui-scm-ui/src/layout/components/AppMain.vue index 6e2882598c..b8c891f811 100644 --- a/anrui-scm/anrui-scm-ui/src/layout/components/AppMain.vue +++ b/anrui-scm/anrui-scm-ui/src/layout/components/AppMain.vue @@ -29,7 +29,7 @@ export default { position: relative; background-color: #FFFFFF; /* margin-left:10px; */ - padding: 0 10px; + padding: 0 20px; overflow-x: hidden; overflow-y: hidden; } diff --git a/anrui-scm/anrui-scm-ui/src/styles/element-table.scss b/anrui-scm/anrui-scm-ui/src/styles/element-table.scss index 727938ca3b..1e131f6f73 100644 --- a/anrui-scm/anrui-scm-ui/src/styles/element-table.scss +++ b/anrui-scm/anrui-scm-ui/src/styles/element-table.scss @@ -1,19 +1,30 @@ .el-table { - .el-table__header{ - tr th{ + .el-table__header { + tr th { background: #edf1f7; color: #333333; + padding: 8px 0; + font-size: 16px; } } } -.table-describe{ +.el-table { + .el-table__body { + tr td { + padding: 6px 0 !important; + } + } +} + +.table-describe { border: 1px solid #dfe4ed; - border-bottom: 0px solid #dfe4ed; - h4{ + border-bottom: 0 solid #dfe4ed; + + h4 { float: left; margin: 0; line-height: 34px; - padding:0 15px; + padding: 0 15px; } } diff --git a/anrui-scm/anrui-scm-ui/src/styles/index.scss b/anrui-scm/anrui-scm-ui/src/styles/index.scss index d9e92df3fa..078d015380 100644 --- a/anrui-scm/anrui-scm-ui/src/styles/index.scss +++ b/anrui-scm/anrui-scm-ui/src/styles/index.scss @@ -93,27 +93,57 @@ div:focus { padding-bottom: 10px; } -.pd-y40{ +.pd-y40 { padding: 40px 0; } -.pd-y20{ + +.pd-y20 { padding: 20px 0; } -.fs20{ +.fs20 { font-size: 20px; } +// 页面上的button按钮 +.app-container { + .el-button--medium { + padding: 10px 14px; + font-size: 16px; + } + + .el-button--small { + padding: 7px 12px; + font-size: 14px; + } + + .el-button--mini { + padding: 7px 10px; + font-size: 12px; + } +} // 添加样式 -.app-container {margin: 5px; +.app-container { + margin: 5px 0 5px 0; background-color: #fff; } // 设置了滚动区域 .main-content{ overflow-x: hidden;overflow-y: auto;height: calc(100vh - 200px);} .listcon{height: calc(100vh - 425px);overflow-y: auto;overflow-x: hidden;} .listconadd{height: calc(100vh - 200px);overflow-y: auto;overflow-x: hidden;} -.listconsub{height: calc(100vh - 310px);overflow-y: auto;overflow-x: hidden;} -.listconsubjxs{height: calc(100vh - 300px);overflow-y: auto;overflow-x: hidden;} + +.listconsub { + height: calc(100vh - 310px); + overflow-y: auto; + overflow-x: hidden; +} + +.listconsubjxs { + height: calc(100vh - 300px); + overflow-y: auto; + overflow-x: hidden; +} + // 搜索的 .webtop { // position: fixed;top: 110px;width: calc(100% - 240px);z-index: 6000; @@ -121,29 +151,52 @@ div:focus { display: flex !important; flex-direction: row; justify-content: space-between !important; - align-items: center; margin-bottom: 0px !important; + align-items: center; + margin-bottom: 0px !important; + font-size: 20px; } + +// 设置了页面头部的内边距和背景色 +.tab-header { + background-color: #edf1f7; + padding: 9px 20px; +} + .filter-item { padding: 0 10px; width: 220px; display: inline-block; } + +// 设置列表页面内容布局 .listtop { display: flex; flex-direction: row; justify-content: space-between; align-items: center; - padding: 0px 0px 10px 15px; + padding: 0 0 0 15px; + margin-top: 0; + border: 1px solid #dfe4ed; + height: 42px; + line-height: 42px; +} + +.listtop .tit { + font-weight: bold; + font-size: 16px +} + +.listtop .pagination { margin: 0; + padding: 0; } -.listtop .tit{font-weight: bold;} -.listtop .pagination{margin: 0;padding: 0;} + .pages { display: flex; flex-direction: row; justify-content: flex-end; align-items: flex-end; - padding: 0px 0px 15px 15px; + padding: 0 0 15px 15px; } .pages .tit{font-weight: bold;} .pages .pagination{margin: 0;} @@ -151,36 +204,42 @@ div:focus { // .listeltable{overflow-y: auto;height: calc(100vh - 420px);} .formadd { - padding: 20px 0; + padding: 88px 20px 0 20px; + font-size: 16px; // height: calc(100vh - 200px);overflow-y: auto; .title { - padding: 10px;font-weight: bold; - font-size: 20px; + padding: 12px; + font-weight: bold; + font-size: 16px; background-color: $header-bg; - text-align: center; + text-align: left; color: #ffffff; } + .el-row { - display:flex; + display: flex; flex-wrap: wrap; border-left: 1px solid $table-border-color; - .el-col{ + .el-col { border-right: 1px solid $table-border-color; border-bottom: 1px solid $table-border-color; - padding: 5px 15px 5px 15px !important; - min-height: 50px; + padding: 0 15px; + min-height: 42px; line-height: 1; - .el-form-item{ + + .el-form-item { margin-bottom: 0; // .addinputw{width: 400px;} - .addinputw{width: 80%;} + .addinputw { + width: 80%; + } } } - } .footer{margin: 20px;} } + .formaddcopy { padding: 20px 0; .title { @@ -311,7 +370,6 @@ div:focus { min-height: 50px; line-height: 50px; font-size: 14px; - } } @@ -324,19 +382,43 @@ div:focus { .bluezi{color: $header-bg; cursor: pointer} // 经销商添加样式 .titcon{ - display: flex;flex-direction: row;justify-content: space-around; background-color: #0294d7;flex: 3; + display: flex; + flex-direction: row; + justify-content: space-around; + background-color: #0294d7; + flex: 3; } -.titcon .title{ - padding: 10px;font-weight: bold; + +.titcon .title { + padding: 10px; + font-weight: bold; font-size: 20px; text-align: center; color: #ffffff; } -.titcon .baocun{text-align: right;flex: 2;padding: 5px 20px;} -.addinputwda{width: 600px;} -.searchcon{margin: 0px 0 10px 0;} -.searchcon .searchbtn{margin: 10px 0;border: #2cab69 1px solid;color: #2cab69;} +.titcon .baocun { + text-align: right; + flex: 2; + padding: 5px 20px; +} + +.addinputwda { + width: 600px; +} + +//.searchcon{margin: 0px 0 10px 0;} +//.searchcon .searchbtn{margin: 10px 0;border: #2cab69 1px solid;color: #2cab69;} +.searchcon .searchbtn { + margin: 5px 0; +} + +.search .btn { + padding: 5px 0; + border: 1px solid #e0e3eb; + text-align: center; + margin-bottom: 5px; +} // 弹出窗口按钮 diff --git a/anrui-scm/anrui-scm-ui/src/styles/sidebar.scss b/anrui-scm/anrui-scm-ui/src/styles/sidebar.scss index 522e48aa18..4d304e2072 100644 --- a/anrui-scm/anrui-scm-ui/src/styles/sidebar.scss +++ b/anrui-scm/anrui-scm-ui/src/styles/sidebar.scss @@ -9,9 +9,9 @@ position: relative; overflow: hidden; } - .TagsView{ - height: 50px; - } + //.TagsView{ + // height: 50px; + //} .home-box{ position: fixed; top: 60px; diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue index 3f5f5f5235..d508db3ed7 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue @@ -42,33 +42,33 @@ @selection-change="handleSelectionChange"> - - - - - - - + + + + + + + - + - + + + + + + - + @@ -536,18 +536,15 @@ export default { padding: 5px 100px; } -.btn { - padding: 15px 0 15px 0; - border: 1px solid #e0e3eb; -} +/*.btn {*/ +/* padding: 15px 0 15px 0;*/ +/* border: 1px solid #e0e3eb;*/ +/*}*/ -.tab-header { - background-color: #edf1f7; - padding: 8px 20px; - margin-bottom: 0 !important; -} +/*.tab-header {*/ +/* background-color: #edf1f7;*/ +/* padding: 8px 20px;*/ +/* margin-bottom: 0 !important;*/ +/*}*/ -.tab-header /deep/ .el-form-item { - margin-bottom: 10px; -} diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue index b32a4dd82e..dc01985a73 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue @@ -14,21 +14,27 @@ 车型名称: - - - - - + + + + + + + + + + + + + + + + + + @@ -463,6 +469,7 @@ export default { this.getType() this.getZuZhi() this.getUseOrg() + this.searchData() }, showEdit(sid) { this.$nextTick(() => { @@ -486,6 +493,7 @@ export default { this.getType() this.getZuZhi() this.getUseOrg() + this.searchData() }, // 获得使用组织 getUseOrg() { @@ -570,14 +578,22 @@ export default { console.log('name:', this.temp.lockedStateValue, 'key:', this.temp.lockedState) }, // 模糊查询 车型名称 selectModelName - searchData(data) { - selectModelName(data).then((response) => { + searchData() { + selectModelName().then((response) => { console.log('车型名称', response) if (response.code === '200') { this.modelName_list = response.data } }) }, + modelSidChange(val){ + if (val) { + const choosetItem = this.modelName_list.filter((item) => item.sid == val) + this.temp.modelName = choosetItem[0].vehicleAlias + console.log('name:', this.temp.modelName, 'key:', this.temp.modelSid) + this.getModelConfig(val) + } + }, // 车型名称 querySearch(queryString, cb) { console.log('查询条件:', queryString) diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue index 278da5cfbd..ee18909d70 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue @@ -101,8 +101,8 @@ - - + + @@ -117,6 +117,11 @@ {{ scope.row.vehicleAlias }} + + + - + @@ -220,7 +225,7 @@ {{ scope.row.configuringBao }} - + diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingpeizhijiageweihuAdd.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingpeizhijiageweihuAdd.vue index ab7ca917c4..bac8317fba 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingpeizhijiageweihuAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingpeizhijiageweihuAdd.vue @@ -37,7 +37,7 @@ - 厂家结算价(万元) + 厂家结算价(元) @@ -45,7 +45,7 @@ - 销售指导价(万元) + 销售指导价(元) diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhi.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhi.vue index 4a8c0c208e..97953fc3b2 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhi.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhi.vue @@ -136,13 +136,18 @@ 查看 - + + + + - + diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhiAdd.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhiAdd.vue index 68014a696f..f960b97173 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhiAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhiAdd.vue @@ -284,6 +284,8 @@