Browse Source

基础信息--样式调整;供应链--品牌、车型、车型配置、车辆台账

master
Zhao Qiqi 3 years ago
parent
commit
64483ff309
  1. 2
      anrui-base/anrui-base-ui/src/App.vue
  2. 2
      anrui-base/anrui-base-ui/src/components/ButtonBar/index.vue
  3. 10
      anrui-base/anrui-base-ui/src/styles/anrui-button.scss
  4. 68
      anrui-base/anrui-base-ui/src/styles/index.scss
  5. 117
      anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanli.vue
  6. 33
      anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiguanli.vue
  7. 4
      anrui-base/anrui-base-ui/src/views/pinpai/pinpaiguanli/pinpaiAdd.vue
  8. 4
      anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js
  9. 6
      anrui-scm/anrui-scm-ui/src/components/pagination/index.vue
  10. 3
      anrui-scm/anrui-scm-ui/src/components/tab-search/index.vue
  11. 2
      anrui-scm/anrui-scm-ui/src/layout/components/AppMain.vue
  12. 23
      anrui-scm/anrui-scm-ui/src/styles/element-table.scss
  13. 142
      anrui-scm/anrui-scm-ui/src/styles/index.scss
  14. 6
      anrui-scm/anrui-scm-ui/src/styles/sidebar.scss
  15. 55
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue
  16. 50
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue
  17. 9
      anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue
  18. 11
      anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexingAdd.vue
  19. 17
      anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingguanlianchangyong.vue
  20. 4
      anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingpeizhijiageweihuAdd.vue
  21. 9
      anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhi.vue
  22. 22
      anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhiAdd.vue

2
anrui-base/anrui-base-ui/src/App.vue

@ -8,7 +8,7 @@
export default {
name: 'App',
mounted() {
},
}
</script>

2
anrui-base/anrui-base-ui/src/components/ButtonBar/index.vue

@ -6,7 +6,7 @@
<!--start 按钮部分开始 :icon="item.icon"-->
<div>
<el-button v-for="item in btnList" :key="item.btnKey" :type="item.type" :size="item.size" :disabled="btndisabled"
@click="btnHandle(item.btnKey)">
@click="btnHandle(item.btnKey)" >
<svg-icon :iconClass="item.icon"/>
{{ item.btnLabel }}
</el-button>

10
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;
}
}

68
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 {

117
anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanli.vue

@ -1,6 +1,6 @@
<template>
<div class="app-container">
<!-- <changshang />-->
<!-- <changshang />-->
<div v-show="viewState == 1">
<button-bar view-title="厂商管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<div class="main-content">
@ -12,46 +12,46 @@
<el-select v-model="listQuery.params.manufacturerName" filterable class="filter-item" clearable
placeholder="请选择厂商名称">
<el-option v-for="item in YongHu" :key="item.sid" :label="item.manufacturerName"
:value="item.manufacturerName"/>
</el-select>
</el-form-item>
<el-form-item label="厂商分类">
<el-select v-model="listQuery.params.supplierType" class="addinputw" placeholder="请选择厂商分类">
<el-option v-for="(item, index) in supplierType_list" :key="index.dictKey" :label="item.dictValue"
:value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="所属分公司">
<el-select v-model="listQuery.params.useOrgSid" class="filter-item" clearable placeholder="请选择所属分公司"
style="width: 300px;">
<el-option v-for="item in useOrg_list" :key="item.sid" :label="item.name"
:value="item.sid"/>
</el-select>
</el-form-item>
<el-form-item label="厂商办公电话">
<el-input v-model="listQuery.params.manufacturerTelePhone" maxlength="130" placeholder=""
class="addinputw" clearable/>
</el-form-item>
<el-form-item label="联系人">
<el-input v-model="listQuery.params.contactName" maxlength="125" placeholder="" class="addinputw"
clearable/>
</el-form-item>
</el-form>
<div class="btn">
<el-button type="primary" size="medium" @click="handleFilter">查询</el-button>
<el-button type="primary" size="medium" @click="handleReset">重置</el-button>
:value="item.manufacturerName"/>
</el-select>
</el-form-item>
<el-form-item label="厂商分类">
<el-select v-model="listQuery.params.supplierType" class="addinputw" placeholder="请选择厂商分类">
<el-option v-for="(item, index) in supplierType_list" :key="index.dictKey" :label="item.dictValue"
:value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="所属分公司">
<el-select v-model="listQuery.params.useOrgSid" class="filter-item" clearable placeholder="请选择所属分公司"
style="width: 300px;">
<el-option v-for="item in useOrg_list" :key="item.sid" :label="item.name"
:value="item.sid"/>
</el-select>
</el-form-item>
<el-form-item label="厂商办公电话">
<el-input v-model="listQuery.params.manufacturerTelePhone" maxlength="130" placeholder=""
class="addinputw" clearable/>
</el-form-item>
<el-form-item label="联系人">
<el-input v-model="listQuery.params.contactName" maxlength="125" placeholder="" class="addinputw"
clearable/>
</el-form-item>
</el-form>
<div class="btn">
<el-button type="primary" size="medium" @click="handleFilter">查询</el-button>
<el-button type="primary" size="medium" @click="handleReset">重置</el-button>
</div>
</div>
</div>
</div>
<div class="listtop">
<div class="tit">厂商信息列表</div>
<!-- 翻页分页 -->
<pageye v-show="total>0" :total="total" :page.sync="listQuery.current" :limit.sync="listQuery.size"
class="pagination" @pagination="getList"/>
</div>
<div class="tit">厂商信息列表</div>
<!-- 翻页分页 -->
<pageye v-show="total>0" :total="total" :page.sync="listQuery.current" :limit.sync="listQuery.size"
class="pagination" @pagination="getList"/>
</div>
<div>
<el-table :key="tableKey" v-loading="listLoading" :data="list" border fit highlight-current-row
style="width: 100%;" @selection-change="handleSelectionChange">
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;"
@selection-change="handleSelectionChange">
<el-table-column type="selection" align="center" width="50"/>
<el-table-column label="序号" fixed type="index" width="80" :index="indexMethod" align="center"/>
<el-table-column label="操作" fixed align="center" width="90px" class-name="small-padding fixed-width">
@ -97,22 +97,21 @@
</el-table>
</div>
<div class="pages">
<!-- 翻页 -->
<pagination v-show="total>0" :total="total" :page.sync="listQuery.current" :limit.sync="listQuery.size"
class="pagination" @pagination="getList"/>
</div>
<!-- 翻页 -->
<pagination v-show="total>0" :total="total" :page.sync="listQuery.current" :limit.sync="listQuery.size"
class="pagination" @pagination="getList"/>
</div>
</div>
</div>
<changshangguanli-add v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState"
@reloadlist="handleFilter" />
<changshanglook v-show="viewState == 4" ref="divinfo" @doback="resetState" />
<changshangguanli-add v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState"
@reloadlist="handleFilter"/>
<changshanglook v-show="viewState == 4" ref="divinfo" @doback="resetState"/>
</div>
</template>
<script>
import {mapGetters} from 'vuex'
import {basefinbankExportExcel, deleteBySids, getNamesDownes, pagerList} from '@/api/jichuxinxi/basemanufacturer' //
import {setXiu} from '@/utils/baocun' //
import {typeValues} from '@/api/jichuxinxi/dictcommons' //
@ -528,21 +527,21 @@ export default {
}
</script>
<style scoped>
/deep/ .el-collapse {
border-top: 0px solid #e6ebf5;
border-bottom: 0px solid #e6ebf5;
}
/deep/ .el-collapse {
border-top: 0px solid #e6ebf5;
border-bottom: 0px solid #e6ebf5;
}
/deep/ .el-collapse-item__content {
margin: 0;
padding: 0;
}
/deep/ .el-collapse-item__content {
margin: 0;
padding: 0;
}
/deep/ .el-collapse-item__wrap {
border-bottom: 0px solid #ebeef5;
}
/deep/ .el-collapse-item__wrap {
border-bottom: 0px solid #ebeef5;
}
/deep/ .el-collapse-item__header {
border-bottom: 0px solid #e6ebf5;
}
/deep/ .el-collapse-item__header {
border-bottom: 0px solid #e6ebf5;
}
</style>

33
anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiguanli.vue

@ -70,74 +70,73 @@
<pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
:limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
<div class="">
<div>
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;"
@selection-change="handleSelectionChange">
<el-table-column width="50px" type="selection" align="center"/>
<el-table-column width="80px" fixed label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column label="操作" fixed align="center" width="170px" class-name="small-padding fixed-width">
<el-table-column type="selection" align="center" width="50"/>
<el-table-column label="序号" fixed type="index" width="80" :index="indexMethod" align="center"/>
<el-table-column label="操作" fixed align="center" width="170px">
<template slot-scope="{row}">
<el-button size="mini" type="primary" @click="handleEdit(row)">办理</el-button>
<el-button size="mini" type="primary" @click="handleCheck(row)">查看</el-button>
<!-- <el-button size="mini" type="primary" @click="handleShenHeLiuCheng(row)">发起审核流程</el-button>-->
</template>
</el-table-column>
<el-table-column width="120" fixed label="状态" align="center">
<el-table-column prop="state" label="状态" width="120" align="center">
<template slot-scope="scope">
<span>{{ scope.row.state }}</span>
</template>
</el-table-column>
<el-table-column width="160" fixed label="所属经销商" align="center">
<el-table-column label="所属经销商" width="180" align="center"> <!-- ? -->
<template slot-scope="scope">
<span>{{ scope.row.pdistributorName }}</span>
</template>
</el-table-column>
<el-table-column width="160" fixed label="经销商名称" align="center">
<el-table-column label="经销商名称" width="180" header-align="center" align="left">
<template slot-scope="scope">
<span class="bluezi" @click="handleCheck(scope.row)">{{ scope.row.disName }}</span>
</template>
</el-table-column>
<el-table-column width="180" label="统一社会信用代码" align="center">
<el-table-column label="统一社会信用代码" width="190" align="center">
<template slot-scope="scope">
<span>{{ scope.row.registNum }}</span>
</template>
</el-table-column>
<el-table-column width="260" label="注册地址" align="center">
<el-table-column label="注册地址" width="220" align="center">
<template slot-scope="scope">
<span>{{ scope.row.registDetailAddress }}</span>
</template>
</el-table-column>
<el-table-column width="130" label="联系电话" align="center">
<el-table-column label="联系电话" width="120" align="center">
<template slot-scope="scope">
<span>{{ scope.row.invoPhone }}</span>
</template>
</el-table-column>
<el-table-column width="200" label="开户行" align="center">
<el-table-column label="开户行" width="110" align="center"> <!-- ? -->
<template slot-scope="scope">
<span>{{ scope.row.invoBank }}</span>
</template>
</el-table-column>
<el-table-column width="200" label="银行账号" align="center">
<el-table-column label="银行账号" width="190" align="center"> <!-- ? -->
<template slot-scope="scope">
<span>{{ scope.row.invoBankNum }}</span>
</template>
</el-table-column>
<el-table-column width="120" label="成立日期" align="center">
<el-table-column label="成立日期" width="120" align="center"> <!-- ? -->
<template slot-scope="scope">
<span>{{ scope.row.setUpTime }}</span>
</template>
</el-table-column>
<el-table-column width="80" label="是否担保" align="center">
<el-table-column label="是否担保" width="120" align="center"> <!-- ? -->
<template slot-scope="scope">
<span>{{ scope.row.isGuarantee }}</span>
</template>
</el-table-column>
<el-table-column width="120" label="本年销售台数" align="center">
<el-table-column label="本年销售台数" width="160" align="center"> <!-- ? -->
<template slot-scope="scope">
<span>{{ scope.row.curYearSaleNum }}</span>
</template>
</el-table-column>
<el-table-column width="120" label="累计销售台数" align="center">
<el-table-column label="累计销售台数" width="160" align="center"> <!-- ? -->
<template slot-scope="scope">
<span>{{ scope.row.cumSaleNum }}</span>
</template>

4
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

4
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({

6
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;

3
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{

2
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;
}

23
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;
}
}

142
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;
}
// 弹出窗口按钮

6
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;

55
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue

@ -42,33 +42,33 @@
@selection-change="handleSelectionChange">
<el-table-column width="50px" type="selection" align="center"/>
<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column label="操作" align="center" width="180px" class-name="small-padding fixed-width">
<template slot-scope="{row}">
<el-button size="mini" type="primary" @click="handleCheck(row)">查看</el-button>
<el-button size="mini" type="primary" @click="cheLiangXiangXiPeiZhi(row)">车型配置</el-button>
</template>
</el-table-column>
<el-table-column label="车型名称" align="center">
<template slot-scope="scope">
<span>{{ scope.row.modelName }}</span>
</template>
</el-table-column>
<el-table-column width="185px" label="车架号" align="center">
<!-- <el-table-column label="操作" align="center" width="180px" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="{row}">-->
<!-- <el-button size="mini" type="primary" @click="handleCheck(row)">查看</el-button>-->
<!-- <el-button size="mini" type="primary" @click="cheLiangXiangXiPeiZhi(row)">车型配置</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="车型名称" align="center">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
<span class="bluezi" @click="handleCheck(scope.row)">{{ scope.row.modelName }}</span>
</template>
</el-table-column>
<el-table-column width="190px" label="发动机号/许可证" align="center">
<el-table-column label="车架号" align="center">
<template slot-scope="scope">
<span>{{ scope.row.engineNo }}</span>
<span class="bluezi" @click="cheLiangXiangXiPeiZhi(scope.row)">{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column width="140px" label="存放地点" align="center">
<!-- <el-table-column width="190px" label="发动机号/许可证" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ scope.row.engineNo }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="存放地点" align="center">
<template slot-scope="scope">
<span>{{ scope.row.locationName }}</span>
</template>
</el-table-column>
<el-table-column width="110px" label="库存状态" align="center">
<el-table-column width="160px" label="库存状态" align="center">
<template slot-scope="scope">
<span>{{ scope.row.vehicleStateValue }}</span>
</template>
@ -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;
}
</style>

50
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue

@ -14,21 +14,27 @@
<el-col :span="12">
<el-form-item prop="modelName">
<span slot="label">车型名称</span>
<el-autocomplete
popper-class="my-autocomplete"
v-model="temp.modelName"
:fetch-suggestions="querySearch"
placeholder="请输入内容"
@select="handleSelectModelName">
<i
class="el-icon-edit el-input__icon"
slot="suffix"
@click="handleIconClick">
</i>
<template slot-scope="{ item }">
<span class="addr">{{ item.modelName }}</span>
</template>
</el-autocomplete>
<el-select ref="config" v-model="temp.modelSid" class="addinputw" clearable placeholder=""
filterable
@change="modelSidChange">
<el-option v-for="(item,index) in modelName_list" :key="item.sid" :label="item.modelName"
:value="item.sid"/>
</el-select>
<!-- <el-autocomplete-->
<!-- popper-class="my-autocomplete"-->
<!-- v-model="temp.modelName"-->
<!-- :fetch-suggestions="querySearch"-->
<!-- placeholder="请输入内容"-->
<!-- @select="handleSelectModelName">-->
<!-- <i-->
<!-- class="el-icon-edit el-input__icon"-->
<!-- slot="suffix"-->
<!-- @click="handleIconClick">-->
<!-- </i>-->
<!-- <template slot-scope="{ item }">-->
<!-- <span class="addr">{{ item.modelName }}</span>-->
<!-- </template>-->
<!-- </el-autocomplete>-->
</el-form-item>
</el-col>
<el-col :span="12">
@ -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)

9
anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue

@ -101,8 +101,8 @@
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;"
@selection-change="handleSelectionChange">
<el-table-column width="50px" type="selection" align="center"/>
<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column label="操作" align="center" width="140px" class-name="small-padding fixed-width">
<el-table-column width="80px" fixed label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column label="操作" fixed align="center" width="140px" class-name="small-padding fixed-width">
<template slot-scope="{row}">
<el-button size="mini" type="primary" @click="handlePeizhi(row)">车型配置</el-button>
</template>
@ -117,6 +117,11 @@
<span class="bluezi" @click="handleCheck(scope.row)">{{ scope.row.vehicleAlias }}</span>
</template>
</el-table-column>
<el-table-column label="车型归属" width="320px" align="center">
<template slot-scope="scope">
<span>{{ scope.row.createOrgName }}</span>
</template>
</el-table-column>
<el-table-column label="版本" width="140px" align="center">
<template slot-scope="scope">
<span>{{ scope.row.vehicleVersion }}</span>

11
anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexingAdd.vue

@ -191,6 +191,7 @@ import {
SaveList,
selectByOrgSid
} from '@/api/cheliang/basevehiclemodel'
import {fetchBySid} from '@/api/cheliang/dictcommons'
import { typeValues } from '@/api/cheliang/dictcommons'
import Upload from '@/components/uploadFile/uploadImg.vue'
@ -221,6 +222,7 @@ export default {
createOrgArry: [], //
temp: {
sid: '', // sid
createOrgName:'',
vehicleTypeCode: '', //
carBrand: '', //
// carBrandValue:'',
@ -449,6 +451,7 @@ export default {
if (isreload === 'true') this.$emit('reloadlist')
this.temp = {
sid: '', // sid
createOrgName:'',
vehicleTypeCode: '', //
carBrandValue: '',
brandName: '',
@ -491,6 +494,14 @@ export default {
getPathSidByUserSid({userSid:userSid}).then((res) => {
if (res.code === '200') {
this.getBrand(res.data)
this.getCreateOrgName(res.data)
}
})
},
getCreateOrgName(sid){
fetchBySid(sid).then((res) => {
if (res.code === '200') {
this.temp.createOrgName = res.data.name
}
})
},

17
anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingguanlianchangyong.vue

@ -129,17 +129,22 @@
<div class="">
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
<el-table-column width="50px" type="selection" align="center"/>
<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column label="操作" align="center" width="110px" class-name="small-padding fixed-width">
<el-table-column width="80px" fixed label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column label="操作" fixed align="center" width="110px" class-name="small-padding fixed-width">
<template slot-scope="{row}">
<el-button size="mini" type="primary" @click="handleJiage(row)">价格维护</el-button>
</template>
</el-table-column>
<el-table-column label="指导价(元)" align="center">
<el-table-column width="110px" fixed label="指导价(元)" align="center">
<template slot-scope="scope">
<span>{{ scope.row.guidedPrice }}</span>
</template>
</el-table-column>
<el-table-column width="130px" label="最新更新日期" align="center">
<template slot-scope="scope">
<span>{{ scope.row.modifyTime }}</span>
</template>
</el-table-column>
<el-table-column label="颜色" align="center">
<template slot-scope="scope">
<span>{{ scope.row.carColor }}</span>
@ -165,7 +170,7 @@
<span>{{ scope.row.specification }}</span>
</template>
</el-table-column>
<el-table-column label="后桥速比" align="center">
<el-table-column width="110px" label="后桥速比" align="center">
<template slot-scope="scope">
<span>{{ scope.row.rearAxleRatio }}</span>
</template>
@ -175,7 +180,7 @@
<span>{{ scope.row.airConditioner }}</span>
</template>
</el-table-column>
<el-table-column label="轮毂材质" align="center">
<el-table-column width="110px" label="轮毂材质" align="center">
<template slot-scope="scope">
<span>{{ scope.row.hubMaterial }}</span>
</template>
@ -220,7 +225,7 @@
<span>{{ scope.row.configuringBao }}</span>
</template>
</el-table-column>
<el-table-column label="独立热源" align="center">
<el-table-column width="110px" label="独立热源" align="center">
<template slot-scope="scope">
<span>{{ scope.row.independentSources }}</span>
</template>

4
anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingpeizhijiageweihuAdd.vue

@ -37,7 +37,7 @@
</el-row>
<el-row>
<el-col :span="6" class="tleftb">
<span>厂家结算价()</span>
<span>厂家结算价()</span>
</el-col>
<el-col :span="6">
<el-form-item>
@ -45,7 +45,7 @@
</el-form-item>
</el-col>
<el-col :span="6" class="tleftb">
<span>销售指导价()</span>
<span>销售指导价()</span>
</el-col>
<el-col :span="6">
<el-form-item>

9
anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhi.vue

@ -136,13 +136,18 @@
<el-button size="mini" type="primary" @click="handleCheck(row)">查看</el-button>
</template>
</el-table-column>
<el-table-column label="关联状态" align="center">
<el-table-column width="110px" label="关联状态" align="center">
<template slot-scope="scope">
<span class="bluezi" @click="handleOpen(scope.row)">{{
scope.row.isRelationState === 1 ? '已关联' : '未关联'
}}</span>
</template>
</el-table-column>
<el-table-column label="车型归属" width="190px" align="center">
<template slot-scope="scope">
<span>{{ scope.row.createOrg }}</span>
</template>
</el-table-column>
<el-table-column label="使用状态" align="center">
<template slot-scope="scope">
<span>{{ scope.row.isUseState === 1 ? '已使用' : '未使用' }}</span>
@ -228,7 +233,7 @@
<span>{{ scope.row.configuringBao }}</span>
</template>
</el-table-column>
<el-table-column label="独立热源" align="center">
<el-table-column label="独立热源" width="110px" align="center">
<template slot-scope="scope">
<span>{{ scope.row.independentSources }}</span>
</template>

22
anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhiAdd.vue

@ -284,6 +284,8 @@
<script>
import { details, pullDown, SaveList, Update } from '@/api/cheliang/basemodelconfig'
import { getPathSidByUserSid } from '@/api/cheliang/basevehiclemodel'
import { fetchBySid } from '@/api/cheliang/dictcommons'
// import { getFileType, parseDate, parseTime, ConvertMenuState } from "@/utils";
// import { findButtonByUserId } from '@/api/sys/permission'
@ -331,6 +333,8 @@ export default {
multimedia_list: [], //
packingCase_list: [], //
temp: {
createOrgSId:'',
createOrg:'',
airConditioner: '', //
airConditionerKey: '', // key
baffleModel: '', // ()
@ -413,6 +417,7 @@ export default {
})
this.viewTitle = '【新增】常用配置信息'
this.getType()
this.getPathSid()
},
showEdit(row) {
@ -426,6 +431,23 @@ export default {
this.temp = resp.data
})
this.getType()
this.getPathSid()
},
getPathSid() {
const userSid = window.sessionStorage.getItem('userSid')
getPathSidByUserSid({userSid:userSid}).then((res) => {
if (res.code === '200') {
this.temp.createOrgSId = res.data
this.getCreateOrgName(res.data)
}
})
},
getCreateOrgName(sid){
fetchBySid(sid).then((res) => {
if (res.code === '200') {
this.temp.createOrg = res.data.name
}
})
},
getType() {
// -

Loading…
Cancel
Save