Browse Source

销售订单

master
Zhao Qiqi 3 years ago
parent
commit
08ee03c1d9
  1. 4
      anrui-buscenter/anrui-buscenter-ui/src/api/jichuxinxi/salepolicy.js
  2. 10
      anrui-buscenter/anrui-buscenter-ui/src/api/salesManagement/orderManagement.js
  3. 3
      anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudanganAdd.vue
  4. 2
      anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/modellibrary.vue
  5. 17
      anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/xiaoshouzhengce.vue
  6. 3
      anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/xuanzekehu.vue
  7. 2
      anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/xuanzekehuAdd.vue
  8. 2
      anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/xunidingdanguanli.vue
  9. 2
      anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/xunidingdanxuanze.vue
  10. 2
      anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/yixiangchexingxuanze.vue
  11. 230
      anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdanAdd.vue

4
anrui-buscenter/anrui-buscenter-ui/src/api/jichuxinxi/salepolicy.js

@ -47,10 +47,10 @@ export function selectBySid(data) {
})
}
// 新增保存
// 新增保存 已改
export function save(data) {
return request({
url: '/buscenter/v1/busorderdiscount/save',
url: 'base/v1/basediscountpackage/save',
method: 'post',
data: data,
headers: {

10
anrui-buscenter/anrui-buscenter-ui/src/api/salesManagement/orderManagement.js

@ -94,6 +94,16 @@ export function getCaigouList(params) {
headers: {'Content-Type': 'application/json'}
})
}
// 现车数量 已改
export function selectCount(params) {
return request({
url: '/base/v1/basevehicle/selectCount',
method: 'get',
params: params,
// headers: {'Content-Type': 'application/json'}
})
}
//
// 销售政策分页列表 已改
export function selectSalesOrderList(params) {

3
anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudanganAdd.vue

@ -858,7 +858,6 @@
// ------------------------------------------------------
//
handleReturn() {
this.visible = false
this.activeNames=['1']
this.$emit('handleReturn')
},
@ -973,7 +972,7 @@
this.activeNames=['1']
this.list1=[]
this.$emit('handleReturn')
}else if('511'===response.code || '513'===response.code){
this.FormLoading = false
this.dialogFormVisible = true

2
anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/modellibrary.vue

@ -396,7 +396,7 @@
this.handReset()
},
handleReturn() {
this.$emit('doReturn') //
this.$emit('handleReturn') //
}
}

17
anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/xiaoshouzhengce.vue

@ -81,16 +81,6 @@
@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 width="150px" label="操作" align="center">
<template slot-scope="scope">
<div class="searchbtns"> <!--:disabled=""-->
<el-button size="small" type="primary"
@click="changeNodeState(scope.row)">办理
</el-button>
<el-button size="small" type="primary" @click="handleCheck(scope.row)">查看</el-button>
</div>
</template>
</el-table-column>
<el-table-column label="状态" align="center">
<template slot-scope="scope">
<span>{{ scope.row.nodeState }}</span>
@ -443,13 +433,18 @@ export default {
// return likeGetCustomerName
}
},
//
showZhuche(){
},
//
handleConfirm() {
this.$emit('handleYouhui',this.row)
this.handleReturn()
},
//
handleReturn() {
this.$emit('doReturn') //
this.$emit('handleReturn') //
},
}

3
anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/xuanzekehu.vue

@ -247,7 +247,8 @@
},
//
handleReturn() {
this.$emit('doReturn') //
this.$emit('handleReturn') //
},
//

2
anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/xuanzekehuAdd.vue

@ -842,7 +842,7 @@
handleReturn() {
this.visible=false
this.activeNames=['1']
this.$emit('doReturn')
// this.$emit('doReturn')
this.$emit('handleReturn')
},
//

2
anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/xunidingdanguanli.vue

@ -246,7 +246,7 @@ export default {
},
//
handleReturn() {
this.$emit('doReturn') //
this.$emit('handleReturn') //
},
//
handleUpdate() {

2
anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/xunidingdanxuanze.vue

@ -161,7 +161,7 @@ export default {
},
//
handleReturn() {
this.$emit('doReturn') //
this.$emit('handleReturn') //
},
//

2
anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/yixiangchexingxuanze.vue

@ -165,7 +165,7 @@ export default {
},
//
handleReturn() {
this.$emit('doReturn') //
this.$emit('handleReturn') //
},
//

230
anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdanAdd.vue

@ -195,15 +195,15 @@
<div class="chosseBtn">
<el-row>
<el-col :span="4">
<el-radio v-model="isXuanzeShow" label="1">现车()</el-radio>
<el-radio v-model="isXuanzeShow" label="1">现车({{ xiancheCount }})</el-radio>
<span v-show="isXuanzeShow == '1'" class="bluezi" @click="openXianche()">选择</span>
</el-col>
<el-col :span="20">
<!--放置五个车架号-->
<el-form-item>
<div v-for="item in temp.busSalesOrderVehicleList">
<div v-for="(item,index) in temp.busSalesOrderVehicleList">
<span>{{ item.linkNo }}</span>
<el-button size="small" type="danger" @click="delXianche()">删除
<el-button size="small" type="danger" @click="delXianche(index)">删除
</el-button>
</div>
</el-form-item>
@ -211,14 +211,14 @@
</el-row>
<el-row>
<el-col :span="4">
<el-radio v-model="isXuanzeShow" label="2">采购订单()</el-radio>
<el-radio v-model="isXuanzeShow" label="2">采购订单({{ caigouCount }})</el-radio>
<span v-show="isXuanzeShow == '2'" class="bluezi" @click="openCaigou()">选择</span>
</el-col>
<el-col :span="20">
<el-form-item>
<div v-for="item in temp.busSalesVehicleOrderList">
<div v-for="(item,index) in temp.busSalesVehicleOrderList">
<span>{{ item.linkNo }}</span>
<el-button size="small" type="danger" @click="delCaigou()">删除
<el-button size="small" type="danger" @click="delCaigou(index)">删除
</el-button>
</div>
</el-form-item>
@ -433,7 +433,7 @@
<el-table-column label="序号" type="index" width="80" align="center"/>
<el-table-column label="操作" align="center">
<template slot-scope="scope">
<el-button type="danger" size="small" @click="handleDelete(scope.row)">删除</el-button>
<el-button type="danger" size="small" @click="deleteZhuche(scope.row)">删除</el-button>
</template>
</el-table-column>
<el-table-column label="优惠名称" align="center">
@ -575,7 +575,7 @@
<el-table-column label="序号" type="index" width="80" align="center"/>
<el-table-column label="操作" align="center">
<template slot-scope="scope">
<el-button type="danger" size="small" @click="handleDelete(scope.row)">删除</el-button>
<el-button type="danger" size="small" @click="deleteXuni(scope.row)">删除</el-button>
</template>
</el-table-column>
<el-table-column label="虚拟订单编号" align="center">
@ -663,19 +663,19 @@
style="width: 100%;" @selection-change="handleSelectionXianche">
<el-table-column align="center" type="selection" width="50"/>
<el-table-column :index="xiancheindexMethod" align="center" label="序号" type="index" width="80"/>
<el-table-column align="center" label="订单编号" prop="billNo">
<el-table-column align="center" label="车架号" prop="billNo">
<template slot-scope="scope">
<span>{{ scope.row.billNo }}</span>
<span>{{ scope.row.linkNo }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="制单日期">
<el-table-column align="center" label="存放地点">
<template slot-scope="scope">
<span>{{ scope.row.createDate }}</span>
<span>{{ scope.row.linkText }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="客户名称">
<el-table-column align="center" label="是否为虚拟订单">
<template slot-scope="scope">
<span>{{ scope.row.customerName }}</span>
<span>{{ scope.row.isFictitious }}</span>
</template>
</el-table-column>
</el-table>
@ -714,7 +714,7 @@
<el-table-column :index="caigouindexMethod" align="center" label="序号" type="index" width="80"/>
<el-table-column align="center" label="采购订单编号" prop="billNo">
<template slot-scope="scope">
<span>{{ scope.row.billNo }}</span>
<span>{{ scope.row.linkNo }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="可使用台数" prop="billNo">
@ -730,7 +730,7 @@
</el-table-column>
<el-table-column align="center" label="采购订单日期">
<template slot-scope="scope">
<span>{{ scope.row.createDate }}</span>
<span>{{ scope.row.linkText }}</span>
</template>
</el-table-column>
</el-table>
@ -743,30 +743,30 @@
</el-dialog>
<!-- 新增客户 -->
<xuanzekehu v-show="relState == '1.1'" ref="xuanzekehu" @doReturn="changeState"
<xuanzekehu v-show="relState == '1.1'" ref="xuanzekehu" @handleReturn="changeState"
@handleCustomerList="selectCustomer"/>
<xuanzekehu-add v-show="relState == '1.2'" ref="xuanzekehuAdd" @doReturn="changeState"
<xuanzekehu-add v-show="relState == '1.2'" ref="xuanzekehuAdd" @handleReturn="changeState"
@handleCustomerAdd="addCustomer"/>
<!-- 选择意向车型 -->
<yixiangchexingxuanze v-show="relState == '2.1'" ref="yixiangchexing" @doReturn="changeState"
<yixiangchexingxuanze v-show="relState == '2.1'" ref="yixiangchexing" @handleReturn="changeState"
@handleyixiangList="selectYixiang"/>
<!-- 选择虚拟订单 -->
<xunidingdanxuanze v-show="relState == '2.2'" ref="xunidingdan" @doReturn="changeState"
<xunidingdanxuanze v-show="relState == '2.2'" ref="xunidingdan" @handleReturn="changeState"
@handlexuniList="selectXuni"/>
<!-- 车型选择 -->
<modellibrary v-show="relState == '2.3'" ref="chexingxuanze" @doReturn="changeState"
<modellibrary v-show="relState == '2.3'" ref="chexingxuanze" @handleReturn="changeState"
@handleChexing="selectChexing"/>
<!-- 车型配置选择 -->
<vehiclelibraryconfiguration v-show="relState == '6.6'" ref="chexingxuanze" @doReturn="changeState"
<vehiclelibraryconfiguration v-show="relState == '6.6'" ref="chexingxuanze" @handleReturn="changeState"
@handleChexing="selectChexing"/>
<!-- 销售政策 -->
<xiao-shou-zheng-ce v-show="relState == '4.1'" ref="zhucheyouhui" @doReturn="changeState"
<!-- 主车优惠销售政策 -->
<xiao-shou-zheng-ce v-show="relState == '4.1'" ref="zhucheyouhui" @handleReturn="changeState"
@handleYouhui="selectYouhui"/>
<!-- 虚拟订单 -->
<xunidingdanguanli v-show="relState == '5.1'" ref="xuniList" @doReturn="changeState"
<xunidingdanguanli v-show="relState == '5.1'" ref="xuniList" @handleReturn="changeState"
@handleXuniList="selectXuniList"/>
<!-- 提交补充页面-->
<xiaoshoudingdan-submit v-show="relState == '3'" ref="divsubmit" @doReturn="changeState"
<xiaoshoudingdan-submit v-show="relState == '3'" ref="divsubmit" @handleReturn="changeState"
@handleSubmit="submitPage"/>
</div>
</template>
@ -781,8 +781,8 @@ import {
getPdfByOrderSid,
getXianList,
saveOrderForm,
selectCount
} from '@/api/salesManagement/orderManagement'
import {getDelDis} from '@/api/jichuxinxi/busdeposit'
import {getNamesDown,} from '@/api/dictcommons/basemanufacturer'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
@ -870,14 +870,15 @@ export default {
depositTypeKey: '', // key
makeUpDeposit: '', //
}, //
busSalesOrderDiscountList: [{
discountExplain: '', //
name: '', //
num: '', //
price: '', //
salesPolicySid: '', //sid
totalValue: '', //
}], //
busSalesOrderDiscountList: [], //
// {
// discountExplain: '', //
// name: '', //
// num: '', //
// price: '', //
// salesPolicySid: '', //sid
// totalValue: '', //
// }
busSalesOrderInsurance: {
insuranceCarMoney: '', //
insuranceName: '', //
@ -950,6 +951,7 @@ export default {
//
xianchetotal: 1,
xiancheLoading: false,
xiancheCount: 0,
xiancheList: {
current: 1,
size: 20,
@ -965,6 +967,7 @@ export default {
//
caigoutotal: 1,
caigouLoading: false,
caigouCount: 0,
caigouList: {
current: 1,
size: 20,
@ -1153,8 +1156,8 @@ export default {
billingTypeKey: '', //key
busDepositFictitiousList: [], //
busSalesOrderDeposit: {
deposit: '111222', //
depositAll: '111222', //
deposit: '', //
depositAll: '', //
depositType: '', //
depositTypeKey: '', // key
makeUpDeposit: '', //
@ -1184,7 +1187,7 @@ export default {
guildPrice: '', //
modelConfig: '', //
modelConfigSid: '', //sid
modelName: '111122222', //
modelName: '', //
modelSid: '', //sid
moreConfig: '', //
specialConfig: '', //
@ -1276,25 +1279,6 @@ export default {
const value = Number(aaa.replace(',', '')) + Number(bbb.replace(',', ''))
this.temp.busSalesOrderPrice.singleFinalPrice = value.toString()
return this.temp.busSalesOrderPrice.singleFinalPrice
// var finalPrice = 0
// var topPrice = 0
// finalPrice = parseFloat(this.temp.busSalesOrderModel.finalPrice)
// topPrice = parseFloat(this.temp.busSalesOrderMakeup.topPrice)
// if (this.temp.busSalesOrderModel.finalPrice !== '') {
// return finalPrice
// }
// if (this.temp.busSalesOrderMakeup.topPrice !== '') {
// return topPrice
// }
//
// var s1 = finalPrice.toString()
// var s2 = topPrice.toString()
// const value = Number(s1.replace(',', '')) + Number(s2.replace(',', ''))
// this.temp.busSalesOrderPrice.singleFinalPrice = value.toString()
// return this.temp.busSalesOrderPrice.singleFinalPrice
},
getSum(total, num) {
return total + num;
@ -1618,14 +1602,14 @@ export default {
}
},
//
delXianche() {
},
//
openCaigou() {
if (this.temp.busSalesOrderModel.modelSid) {
this.caigouVisible = true
this.$nextTick(() => {
this.handleCaigou()
})
} else {
this.$message({
showClose: true,
@ -1635,13 +1619,11 @@ export default {
}
},
//
delCaigou() {
},
//
openZhuche() {
this.relState = '4.1'
this.$refs['zhucheyouhui'].showZhuche(this.temp.busSalesOrderDiscountList)
},
//
openXunidingdanList() {
@ -1741,26 +1723,42 @@ export default {
// ---------------- ----------------
//
selectionXianche() {
this.temp.busSalesOrderVehicleList = this.xiancheChoice
const xincheSids = []
this.row.forEach((element) => {
xincheSids.push(element.linkSid)
})
this.xiancheList.params.sidList = xincheSids
this.vehicleList = xincheSids
this.xiancheLoading = false
console.log('确认选择现车:', this.temp.busSalesOrderVehicleList, this.vehicleList)
if (this.xiancheChoice.length > 0) {
this.temp.busSalesOrderVehicleList = this.xiancheChoice
const xincheSids = []
this.xiancheChoice.forEach((element) => {
xincheSids.push(element.linkSid)
})
this.xiancheList.params.sidList = xincheSids
this.vehicleList = xincheSids
this.xiancheVisible = false
console.log('确认选择现车:', this.temp.busSalesOrderVehicleList, this.vehicleList)
} else {
this.$message({
showClose: true,
message: '请选择车架号!',
type: 'error'
});
}
},
//
selectionCaigou() {
this.temp.busSalesVehicleOrderList = this.caigouChoice
const caigouSids = []
this.row.forEach((element) => {
caigouSids.push(element.linkSid)
})
this.caigouList.params.sidList = caigouSids
this.caigouLoading = false
console.log('确认选择采购', this.temp.busSalesVehicleOrderList, caigouSids)
if (this.caigouChoice.length > 0) {
this.temp.busSalesVehicleOrderList = this.caigouChoice
const caigouSids = []
this.caigouChoice.forEach((element) => {
caigouSids.push(element.linkSid)
})
this.caigouList.params.sidList = caigouSids
this.caigouVisible = false
console.log('确认选择采购', this.temp.busSalesVehicleOrderList, caigouSids)
} else {
this.$message({
showClose: true,
message: '请选择车架号!',
type: 'error'
});
}
},
//
changeState() {
@ -1797,6 +1795,19 @@ export default {
modelSid: modelData.modelSid, //sid
moreConfig: modelData.otherConfig, //
}
const countList = {
customerSid: this.temp.customerSid, //sid
modelConfigSid: this.temp.busSalesOrderModel.modelConfigSid, //sid
modelSid: this.temp.busSalesOrderModel.modelSid, //sid
staffSid: window.sessionStorage.getItem('staffSid'), //sid
type: 1, //
}
selectCount(countList).then((response) => {
if (response.success) {
this.xiancheCount = response.data
console.log('数量', response.data)
}
})
},
//
selectXuni(modelData, type) {
@ -1814,6 +1825,19 @@ export default {
modelSid: modelData.modelSid, //sid
moreConfig: modelData.otherConfig, //
}
const countList = {
customerSid: this.temp.customerSid, //sid
modelConfigSid: this.temp.busSalesOrderModel.modelConfigSid, //sid
modelSid: this.temp.busSalesOrderModel.modelSid, //sid
staffSid: window.sessionStorage.getItem('staffSid'), //sid
type: 2, //
}
selectCount(countList).then((response) => {
if (response.success) {
this.xiancheCount = response.data
console.log('数量', response.data)
}
})
},
//
selectChexing(modelData, type) {
@ -1831,6 +1855,20 @@ export default {
modelSid: modelData.modelSid, //sid
moreConfig: modelData.moreConfig, //
}
const countList = {
customerSid: this.temp.customerSid, //sid
modelConfigSid: this.temp.busSalesOrderModel.modelConfigSid, //sid
modelSid: this.temp.busSalesOrderModel.modelSid, //sid
staffSid: window.sessionStorage.getItem('staffSid'), //sid
type: 3, //
}
selectCount(countList).then((response) => {
if (response.success) {
this.xiancheCount = response.data
console.log('数量', response.data)
}
})
},
selectYouhui(row) {
console.log('所选优惠包', row)
@ -1859,18 +1897,34 @@ export default {
},
// ------------------------------------------------------
//
handleDelete(row) {
getDelDis(row.orderSid).then((response) => {
if (response.code === '200') {
this.temp.busOrderDiscountDtoList = response.data
}
})
//
deleteZhuche() {
},
addXunidingjin() {
//
deleteXuni() {
},
//
delXianche(index) {
console.log('对应索引', index)
this.temp.busSalesOrderVehicleList.splice(index, 1)
},
//
delCaigou(index) {
console.log('对应索引', index)
this.temp.busSalesOrderVehicleList.splice(index, 1)
},
// handleDelete(row) {
// getDelDis(row.orderSid).then((response) => {
// if (response.code === '200') {
// this.temp.busOrderDiscountDtoList = response.data
// }
// })
// },
addXunidingjin() {
},
// 使
//

Loading…
Cancel
Save