Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
dimengzhe 3 years ago
parent
commit
caa9a391b0
  1. 3
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/dicttype/DictTypeVo.java
  2. 14
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingService.java
  3. 20
      anrui-scm/anrui-scm-ui/src/api/cheliang/cheliangxiaoshou.js
  4. 9
      anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js
  5. 8
      anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js
  6. 22
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue
  7. 147
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu.vue
  8. 200
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/chelaingxiaoshouInfo.vue
  9. 295
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshouguanli.vue
  10. 2
      anrui-scm/anrui-scm-ui/src/views/kucunguanli/panku/pankuByPanYing.vue
  11. 20
      anrui-system-ui/src/views/dictManage/dictCommon.vue

3
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/dicttype/DictTypeVo.java

@ -25,5 +25,8 @@ public class DictTypeVo implements Vo {
@ApiModelProperty(value = "说明")
private String remarks;
@ApiModelProperty(value = "分组名称")
private String groupName;
}

14
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingService.java

@ -69,7 +69,7 @@ public class SysMappingService extends MybatisBaseService<SysMappingMapper, SysM
public QueryWrapper<SysMappingVo> queryWrapper(SysMappingQuery query) {
QueryWrapper<SysMappingVo> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getMap_sourceKey())) {
qw.eq("sm.map_sourceKey", query.getMap_sourceKey());
qw.like("sm.map_sourceKey", query.getMap_sourceKey());
}
if (StringUtils.isNotBlank(query.getMap_sourceValue())) {
qw.like("sm.map_sourceValue", query.getMap_sourceValue());
@ -81,22 +81,22 @@ public class SysMappingService extends MybatisBaseService<SysMappingMapper, SysM
qw.like("sm.map_item", query.getMap_item());
}
if (StringUtils.isNotBlank(query.getMap_itemKey())) {
qw.eq("sm.map_itemKey", query.getMap_itemKey());
qw.like("sm.map_itemKey", query.getMap_itemKey());
}
if (StringUtils.isNotBlank(query.getMap_itemValue())) {
qw.like("sm.map_itemValue", query.getMap_itemValue());
}
if (StringUtils.isNotBlank(query.getDictTypeCode())) {
qw.eq("dc.dictKey", query.getDictTypeCode());
qw.like("dt.dictTypeCode", query.getDictTypeCode());
}
if (StringUtils.isNotBlank(query.getDictTypeName())) {
qw.like("dc.dictValue", query.getDictTypeName());
qw.like("dt.dictTypeName", query.getDictTypeName());
}
if (StringUtils.isNotBlank(query.getDictKey())) {
qw.eq("dt.dictTypeCode", query.getDictKey());
qw.like("dc.dictKey", query.getDictKey());
}
if (StringUtils.isNotBlank(query.getDictValue())) {
qw.like("dt.dictTypeName", query.getDictValue());
qw.like("dc.dictValue", query.getDictValue());
}
return qw;
}
@ -137,7 +137,7 @@ public class SysMappingService extends MybatisBaseService<SysMappingMapper, SysM
public void saveMappingList(List<SysMappingDto> dto) {
for (SysMappingDto sysMappingDto : dto) {
SysMapping entity = new SysMapping();
BeanUtil.copyProperties(sysMappingDto, entity, "sid");
BeanUtil.copyProperties(sysMappingDto, entity);
entity.setCreateBySid(sysMappingDto.getUserSid());
save(entity);
}

20
anrui-scm/anrui-scm-ui/src/api/cheliang/cheliangxiaoshou.js

@ -0,0 +1,20 @@
import request from '@/utils/request'
// 车辆销售(出库)列表
export function pagerList(data) {
return request({
url: '/base/v1/basevehicleout/pagerList',
data,
method: 'post',
headers: { 'Content-Type': 'application/json' }
})
}
// 出库详情
export function fetcBySid(sid) {
return request({
url: '/base/v1/basevehicleout/details/' + sid,
method: 'get'
})
}

9
anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js

@ -119,5 +119,12 @@ export function selectDisList(data) {
params: data
})
}
// 获取销售专员下的中介人员
export function selectMiddleList(data) {
return request({
url: '/base/v1/basemiddleman/selectMiddleList',
method: 'GET',
params: data
})
}

8
anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js

@ -257,6 +257,14 @@ const codemenu = [
import('@/views/cheliang/cheliangtaizhang/cheliangtaizhangInfo.vue'),
name: 'CheliangtaizhangInfo',
meta: { title: '车辆信息', noCache: true }
},
// 车辆销售
{
path: '/cheliangxiaoshou/cheliangxiaoshouguanli',
component: () =>
import('@/views/cheliang/cheliangxiaoshou/cheliangxiaoshouguanli.vue'),
name: 'cheliangxiaoshou',
meta: { title: '车辆销售管理', noCache: true }
}
]
},

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

@ -563,18 +563,22 @@ export default {
//
doChuku() {
if (this.sids.length === 0) {
this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行出库操作' })
this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行出库操作' })
return
}
for (var i = 0; i < this.multipleSelection.length; i++) {
if (this.multipleSelection[i].vehicleStateValue !== '库存' && this.multipleSelection[i].vehicleStateValue !== '调入' && this.multipleSelection[i].isProblemVeh !== '无问题') {
const tip = '因车架号' + this.multipleSelection[i].vinNo + '的车辆不满足出库条件,出库操作失败'
this.$message({ showClose: true, type: 'error', message: tip })
return
} else if (this.sids.length > 1) {
this.$message({ showClose: true, type: 'error', message: '只选择一条记录进行出库操作' })
return
} else {
for (var i = 0; i < this.multipleSelection.length; i++) {
if (this.multipleSelection[i].vehicleStateValue !== '库存' && this.multipleSelection[i].vehicleStateValue !== '调入' && this.multipleSelection[i].isProblemVeh !== '无问题') {
const tip = '因车架号' + this.multipleSelection[i].vinNo + '的车辆不满足出库条件,出库操作失败'
this.$message({ showClose: true, type: 'error', message: tip })
return
}
}
this.viewState = 6
this.$refs['divChu'].showChu(this.multipleSelection)
}
this.viewState = 6
this.$refs['divChu'].showChu(this.multipleSelection)
},
//
doMaiduan() { // salesDate settlementStatus

147
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu.vue

@ -3,8 +3,8 @@
<div class="tab-header webtop">
<div>车辆出库</div>
<div>
<el-button type="primary" size="small" :disabled="dialogFormVisible" @click="handleCreate()">保存</el-button>
<el-button type="info" size="small" @click="handleReturn()">返回</el-button>
<el-button type="primary" size="small" @click="handleCreate()">保存</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
<div class="listconadd">
@ -18,7 +18,7 @@
<el-form-item><span>{{ temp.vinNo }}</span></el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>出库类型</span>
<span>销售类型</span>
</el-col>
<el-col :span="8">
<el-form-item prop="type">
@ -52,11 +52,11 @@
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>合同编号</span>
<span>销售日期</span>
</el-col>
<el-col :span="8">
<el-form-item prop="contractNo">
<el-input v-model="temp.contractNo" maxlength="125" placeholder="" class="addinputw" clearable/>
<el-form-item>
<el-date-picker v-model="temp.saleDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
@ -69,10 +69,18 @@
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>合同编号</span>
</el-col>
<el-col :span="8">
<el-form-item prop="concatNo">
<el-input v-model="temp.concatNo" maxlength="125" placeholder="" class="addinputw" clearable/>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>是否为终端客户</span>
</el-col>
<el-col :span="20">
<el-col :span="8">
<el-form-item>
<el-radio v-model="temp.isTerminal" label="1"></el-radio>
<el-radio v-model="temp.isTerminal" label="0"></el-radio>
@ -95,57 +103,75 @@
</el-col>
<el-col :span="8">
<el-form-item prop="mobile">
<el-input v-model="temp.mobile" maxlength="125" placeholder="" class="addinputw" clearable/>
<span>{{ temp.mobile }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row v-show="temp.isTerminal == '0'">
<el-row>
<el-col :span="4" class="tleftb">
<span>实际购车人名称</span>
<span>赠品说明</span>
</el-col>
<el-col :span="8">
<el-form-item prop="actualCustomer">
<el-select v-model="temp.actualCustomer" class="addinputw" clearable placeholder="" @change="ChangeActualCustomer">
<el-option v-for="item in actualCustomer_list" :key="item.sid" :label="item.name" :value="item.sid"/>
</el-select>
<el-form-item>
<el-input v-model="temp.giftsDescription" maxlength="125" placeholder="" class="addinputw" clearable/>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>手机号码</span>
<span>销售折让()</span>
</el-col>
<el-col :span="8">
<el-form-item prop="actualMobile">
<el-input v-model="temp.actualMobile" maxlength="125" placeholder="" class="addinputw" clearable/>
<el-form-item>
<el-input v-model="temp.salesAllowance" maxlength="125" placeholder="" class="addinputw" clearable @keyup.native="temp.salesAllowance = oninput(temp.salesAllowance,2)"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>赠品说明</span>
<span>中介人1</span>
</el-col>
<el-col :span="20">
<el-form-item>
<el-input v-model="temp.giftsDescription" maxlength="125" placeholder="" class="addinputw" clearable/>
<el-col :span="8">
<el-form-item prop="">
<el-select v-model="temp.middleOne" class="addinputw" clearable placeholder="" @change="changeDistributorOne">
<el-option v-for="item in distributor_list" :key="item.sid" :label="item.name" :value="item.name"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>返利金额1()</span>
</el-col>
<el-col :span="8">
<el-form-item prop="mobile">
<el-input v-model="temp.rebateMoneyOne" maxlength="125" placeholder="" class="addinputw" clearable @keyup.native="temp.rebateMoneyOne = oninput(temp.rebateMoneyOne,2)"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>二级经销商</span>
<span>中介人2</span>
</el-col>
<el-col :span="8">
<el-form-item prop="distributorName">
<el-select v-model="temp.distributorName" class="addinputw" clearable placeholder="" @change="changeDistributor">
<el-form-item prop="">
<el-select v-model="temp.middleTwo" class="addinputw" clearable placeholder="" @change="changeDistributorTwo">
<el-option v-for="item in distributor_list" :key="item.sid" :label="item.name" :value="item.name"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>返利金额()</span>
<span>返利金额2()</span>
</el-col>
<el-col :span="8">
<el-form-item prop="mobile">
<el-input v-model="temp.rebateAmount" maxlength="125" placeholder="" class="addinputw" clearable @keyup.native="temp.rebateAmount = oninput(temp.rebateAmount,2)"/>
<el-input v-model="temp.rebateMoneyTwo" maxlength="125" placeholder="" class="addinputw" clearable @keyup.native="temp.rebateMoneyTwo = oninput(temp.rebateMoneyTwo,2)"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>备注</span>
</el-col>
<el-col :span="20">
<el-form-item>
<el-input v-model="temp.remarks" placeholder="" clearable class="addinputw"/>
</el-form-item>
</el-col>
</el-row>
@ -156,7 +182,7 @@
<script>
import { vehicleOutLibrary } from '@/api/cheliang/basevehicle'
import { selectOrgList, selectCustomerList, selectDisList } from '@/api/cheliang/dictcommons'
import { selectOrgList, selectCustomerList, selectMiddleList } from '@/api/cheliang/dictcommons'
import { typeValues } from '@/api/cheliang/dictcommons'
export default {
@ -178,34 +204,34 @@ export default {
return {
temp: {
vinNo: '',
contractNo: '', //
distributorName: '', //
distributorSid: '',
vinSid: '',
concatNo: '', //
saleDate: '',
middleOne: '', // 1
rebateMoneyOne: '', // 1
middleOneSid: '',
middleTwo: '', // 2
middleTwoSid: '',
rebateMoneyTwo: '', // 2
giftsDescription: '', //
salesAllowance: '',
isTerminal: '', //
customerName: '', //
customerSid: '',
mobile: '', //
actualCustomer: '', //
actualSid: '',
actualMobile: '', //
orgName: '', //
orgSid: '', // Sid
price: '', //
rebateAmount: '', //
staffName: '', //
staffSid: '', // sid
type: '', //
typeKey: '', // Key
queryList: [] //
},
payType_list: [], //
org_list: [], //
staff_list: [], //
customer_list: [], //
actualCustomer_list: [], //
distributor_list: [], //
dialogFormVisible: false,
distributor_list: [], //
rules: {
mobile: [
{
@ -245,17 +271,12 @@ export default {
this.org_list = resp.data
}
})
selectDisList({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
if (res.success) {
this.distributor_list = res.data
}
})
},
//
outLibraryChange(val) {
if (val) {
const choosetItem = this.payType_list.filter((item) => item.dictValue === val)
this.temp.outLibraryKey = choosetItem[0].dictKey
this.temp.typeKey = choosetItem[0].dictKey
console.log('name:', this.temp.outLibraryValue, 'key:', this.temp.outLibraryKey)
}
},
@ -270,7 +291,11 @@ export default {
selectCustomerList({ staffSid: this.temp.staffSid, userSid: window.sessionStorage.getItem('userSid') }).then((resp) => {
if (resp.success) {
this.customer_list = resp.data
this.actualCustomer_list = resp.data
}
})
selectMiddleList({ staffSid: this.temp.staffSid }).then((res) => {
if (res.success) {
this.distributor_list = res.data
}
})
},
@ -279,42 +304,27 @@ export default {
this.temp.customerSid = choosetItem[0].sid
this.temp.mobile = choosetItem[0].mobile
},
ChangeActualCustomer(value) {
const choosetItem = this.actualCustomer_list.filter((item) => item.name === value)
this.temp.actualSid = choosetItem[0].sid
this.temp.actualMobile = choosetItem[0].mobile
changeDistributorOne(value) {
const choosetItem = this.distributor_list.filter((item) => item.name === value)
this.temp.middleOneSid = choosetItem[0].sid
},
changeDistributor(value) {
changeDistributorTwo(value) {
const choosetItem = this.distributor_list.filter((item) => item.name === value)
this.temp.distributorSid = choosetItem[0].sid
this.temp.middleTwoSid = choosetItem[0].sid
},
showChu(multipleSelection) {
const aa = []
const bb = []
multipleSelection.forEach((e) => {
aa.push({
vinNo: e.vinNo,
vinSid: e.sid
})
bb.push(e.vinNo)
})
this.temp.queryList = aa
this.temp.vinNo = bb.join(',')
this.temp.vinNo = multipleSelection[0].vinNo
this.temp.vinSid = multipleSelection[0].sid
this.getType()
},
//
handleCreate() {
this.dialogFormVisible = true
vehicleOutLibrary(this.temp).then((response) => {
if (response.code === '200') {
this.dialogFormVisible = false
if (response.success) {
this.$message({ showClose: true, type: 'success', message: '保存成功' })
this.handleReturn('true')
} else {
this.dialogFormVisible = false
}
}).catch(e => {
this.dialogFormVisible = false
})
},
//
@ -322,7 +332,6 @@ export default {
if (isreload === 'true') this.$emit('reloadlist')
this.temp = {}
this.$emit('doback')
// this.$router.go(-1)
}
}
}

200
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/chelaingxiaoshouInfo.vue

@ -0,0 +1,200 @@
<template>
<div class="app-container">
<div class="tab-header webtop">
<div>车辆出库</div>
<div>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
<div class="listconadd">
<div class="titwu">车辆出库</div>
<el-form ref="dataForm" :model="temp" label-position="right" class="formadd" :rules="rules">
<el-row class="first_row">
<el-col :span="4" class="tleftb">
<span>车架号</span>
</el-col>
<el-col :span="8">
<el-form-item><span>{{ temp.vinNo }}</span></el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>销售类型</span>
</el-col>
<el-col :span="8">
<el-form-item>
<span>{{ temp.type }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>销售部门</span>
</el-col>
<el-col :span="8">
<el-form-item>
<span>{{ temp.orgName }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>销售专员</span>
</el-col>
<el-col :span="8">
<el-form-item>
<span>{{ temp.staffName }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>销售日期</span>
</el-col>
<el-col :span="8">
<el-form-item>
<span>{{ temp.saleDate }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>成交价()</span>
</el-col>
<el-col :span="8">
<el-form-item>
<span>{{ temp.price }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>合同编号</span>
</el-col>
<el-col :span="8">
<el-form-item>
<span>{{ temp.concatNo }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>是否为终端客户</span>
</el-col>
<el-col :span="8">
<el-form-item>
<span>{{ temp.isTerminal }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>客户名称</span>
</el-col>
<el-col :span="8">
<el-form-item>
<span>{{ temp.customerName }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>手机号码</span>
</el-col>
<el-col :span="8">
<el-form-item>
<span>{{ temp.mobile }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>赠品说明</span>
</el-col>
<el-col :span="8">
<el-form-item>
<span>{{ temp.giftsDescription }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>销售折让()</span>
</el-col>
<el-col :span="8">
<el-form-item>
<span>{{ temp.salesAllowance }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>中介人1</span>
</el-col>
<el-col :span="8">
<el-form-item>
<span>{{ temp.middleOne }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>返利金额1()</span>
</el-col>
<el-col :span="8">
<el-form-item>
<span>{{ temp.rebateMoneyOne }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>中介人2</span>
</el-col>
<el-col :span="8">
<el-form-item>
<span>{{ temp.middleTwo }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>返利金额2()</span>
</el-col>
<el-col :span="8">
<el-form-item>
<span>{{ temp.rebateMoneyTwo }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>备注</span>
</el-col>
<el-col :span="20">
<el-form-item>
<span>{{ temp.remarks }}</span>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</div>
</template>
<script>
import { fetcBySid } from '@/api/cheliang/cheliangxiaoshou'
export default {
name: 'cheliangxiaoshouInfo',
data() {
return {
temp: {
},
rules: {}
}
},
methods: {
showInfo(row) {
fetcBySid(row.sid).then((resp) => {
if (resp.success) {
this.temp = resp.data
}
})
},
//
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.temp = {}
this.$emit('doback')
}
}
}
</script>
<style scoped>
</style>

295
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshouguanli.vue

@ -0,0 +1,295 @@
<template>
<div class="app-container">
<!-- Start 列表页面 -->
<div v-show="viewState == 1">
<button-bar view-title="车辆销售管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<div class="main-content">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
<el-form-item label="车架号">
<el-input v-model="listQuery.params.vinNo" placeholder="请输入车架号" clearable/>
</el-form-item>
<el-form-item label="销售类型">
<el-select v-model="listQuery.params.typeKey" placeholder="" filterable>
<el-option v-for="item in payType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="销售日期">
<div class="block" style="float: left;">
<el-date-picker v-model="listQuery.params.saleDateStart" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
</div>
<div style="float: left;margin: 0px 10px"></div>
<div class="block" style="float: left;">
<el-date-picker v-model="listQuery.params.saleDateEnd" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
</div>
</el-form-item>
<el-form-item label="合同编号">
<el-input v-model="listQuery.params.concatNo" placeholder="" clearable/>
</el-form-item>
<el-form-item label="客户名称">
<el-input v-model="listQuery.params.customerName" placeholder="" clearable/>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" @click="handleFilter" size="small">查询</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="handleReset" size="small">重置</el-button>
</div>
</div>
</div>
<div class="listtop">
<div class="tit">车辆销售列表</div>
<pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
<div class="">
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;">
<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column label="操作" width="180px" align="center">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
</template>
</el-table-column>
<el-table-column label="车架号" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="车型(配置简述)" align="center" width="400">
<template slot-scope="scope">
<span>{{ scope.row.modelConfig }}</span>
</template>
</el-table-column>
<el-table-column label="销售类型" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.type }}</span>
</template>
</el-table-column>
<el-table-column label="销售日期" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.saleDate }}</span>
</template>
</el-table-column>
<el-table-column label="成交价(元)" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.price }}</span>
</template>
</el-table-column>
<el-table-column label="销售部门" align="center" width="180">
<template slot-scope="scope">
<span>{{ scope.row.orgName }}</span>
</template>
</el-table-column>
<el-table-column label="销售专员" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.staffName }}</span>
</template>
</el-table-column>
<el-table-column label="合同编号" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.concatNo }}</span>
</template>
</el-table-column>
<el-table-column label="是否为终端客户" align="center" width="160">
<template slot-scope="scope">
<span>{{ scope.row.isTerminal }}</span>
</template>
</el-table-column>
<el-table-column label="客户名称" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.customerName }}</span>
</template>
</el-table-column>
<el-table-column label="手机号码" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.mobile }}</span>
</template>
</el-table-column>
<el-table-column label="赠品说明" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.giftsDescription }}</span>
</template>
</el-table-column>
<el-table-column label="销售折让" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.salesAllowance }}</span>
</template>
</el-table-column>
<el-table-column label="中介人1" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.middleOne }}</span>
</template>
</el-table-column>
<el-table-column label="返利金额1" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.rebateMoneyOne }}</span>
</template>
</el-table-column>
<el-table-column label="中介人2" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.middleTwo }}</span>
</template>
</el-table-column>
<el-table-column label="返利金额2" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.rebateMoneyTwo }}</span>
</template>
</el-table-column>
</el-table>
</div>
<div class="pages">
<!-- 翻页 -->
<pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
</div>
</div>
<chelaingxiaoshouInfo v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
</div>
</template>
<script>
import { pagerList } from '@/api/cheliang/cheliangxiaoshou'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
import { typeValues } from '@/api/cheliang/dictcommons'
import chelaingxiaoshouInfo from './chelaingxiaoshouInfo'
export default {
name: 'cheliangxiaoshou',
components: {
Pagination,
pageye,
ButtonBar,
chelaingxiaoshouInfo
},
data() {
return {
btndisabled: false,
viewState: 1,
btnList: [
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}
],
isSearchShow: false,
searchxianshitit: '显示查询条件',
// -----------
tableKey: 0,
list: [],
payType_list: [],
FormLoading: false,
listLoading: false,
listQuery: {
params: {
concatNo: '',
customerName: '',
saleDateEnd: '',
saleDateStart: '',
typeKey: '',
vinNo: ''
},
current: 1,
size: 5,
total: 0
},
rules: {}
}
},
created() {
//
this.getList()
this.init()
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
},
methods: {
init() {
typeValues({ type: 'payType' }).then((res) => {
if (res.success) {
this.payType_list = res.data
}
})
},
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
} else {
this.searchxianshitit = '显示查询条件'
}
},
btnHandle(btnKey) {
console.log('XXXXXXXXXXXXXXX ' + btnKey)
switch (btnKey) {
case 'doClose':
this.doClose()
break
default:
break
}
},
//
indexMethod(index) {
var pagestart = (this.listQuery.current - 1) * this.listQuery.size
var pageindex = index + 1 + pagestart
return pageindex
},
//
getList() {
this.listLoading = true
pagerList(this.listQuery).then((response) => {
console.log('列表查询结果:', response)
this.listLoading = false
if (response.success && response.data && response.data.total > 0) {
this.list = response.data.records
this.listQuery.total = response.data.total
} else {
this.list = []
this.listQuery.total = 0
}
})
},
//
handleFilter() {
this.listQuery.current = 1
this.getList()
},
handleReset() {
this.listQuery = {
params: {
concatNo: '',
customerName: '',
saleDateEnd: '',
saleDateStart: '',
typeKey: '',
vinNo: ''
},
current: 1,
size: 5,
total: 0
}
this.getList()
},
toInfo(row) {
this.viewState = 2
this.$refs['divInfo'].showInfo(row)
},
resetState() {
this.viewState = 1
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
}
}
}
</script>
<style scoped>
</style>

2
anrui-scm/anrui-scm-ui/src/views/kucunguanli/panku/pankuByPanYing.vue

@ -104,7 +104,7 @@ export default {
this.$refs['form_obj'].clearValidate()
})
this.formobj.InventoryState = '盘盈'
this.formobj.InventoryStateKey = '001'
this.formobj.InventoryStateKey = '003'
this.formobj.loginName = window.sessionStorage.getItem('name')
this.formobj.loginSid = window.sessionStorage.getItem('userSid')
if (inventoryName !== '') {

20
anrui-system-ui/src/views/dictManage/dictCommon.vue

@ -40,6 +40,8 @@
</el-table-column>
<el-table-column prop="dictType" label="字典分类编码" align="center">
</el-table-column>
<el-table-column prop="groupName" label="数据分组" align="center">
</el-table-column>
<el-table-column prop="dictKey" label="数据key" align="center">
</el-table-column>
<el-table-column prop="dictValue" label="数据value" align="center">
@ -56,6 +58,12 @@
{{ form.dictType }}
</td>
</tr>
<tr>
<td>数据分组</td>
<td>
<el-input v-model="form.groupName"></el-input>
</td>
</tr>
<tr>
<td>数据key</td>
<td>
@ -69,10 +77,10 @@
</td>
</tr>
</table>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="save()"> </el-button>
<el-button @click="editDialog = false"> </el-button>
</span>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="save()"> </el-button>
<el-button @click="editDialog = false"> </el-button>
</div>
</el-dialog>
</div>
<dictMap v-show="viewState == 2" ref="divAdd" @doback="resetState"/>
@ -94,6 +102,7 @@ export default {
form: {
dictKey: '',
dictType: '',
groupName: '',
dictValue: '',
parentSid: ''
},
@ -118,6 +127,7 @@ export default {
handler(val) {
this.form.parentSid = val.sid
this.form.dictType = val.dictType
this.form.groupName = val.groupName
this.page.params.parentSid = val.sid
this.page.params.dictType = val.dictType
this.getPageList(this.page)
@ -170,12 +180,14 @@ export default {
this.dialogTitle = '新增'
this.editDialog = true
this.form.dictKey = ''
this.form.groupName = ''
this.form.dictValue = ''
this.form.sid = ''
},
closeDict() {
this.form.parentSid = ''
this.form.dictType = ''
this.form.groupName = ''
this.page.params.parentSid = ''
this.page.params.dictType = ''
this.$emit('doback')

Loading…
Cancel
Save