|
|
|
|
@ -283,13 +283,13 @@
|
|
|
|
|
@selection="selectionChange" |
|
|
|
|
> |
|
|
|
|
<template #default="slotProps"> |
|
|
|
|
<!-- orderSelectList --> |
|
|
|
|
|
|
|
|
|
<el-text |
|
|
|
|
type="primary" |
|
|
|
|
link |
|
|
|
|
icon="el-icon-edit" |
|
|
|
|
@click="removeStockList(slotProps.scope.row)" |
|
|
|
|
>移除 |
|
|
|
|
@click="updateClient(slotProps.scope.row)" |
|
|
|
|
>修改客户 |
|
|
|
|
</el-text> |
|
|
|
|
</template> |
|
|
|
|
</tablecmt> |
|
|
|
|
@ -308,6 +308,7 @@
|
|
|
|
|
layout="total, sizes, prev, pager, next, jumper" |
|
|
|
|
:total="page.total" |
|
|
|
|
> |
|
|
|
|
|
|
|
|
|
</el-pagination> |
|
|
|
|
</div> |
|
|
|
|
</el-row> |
|
|
|
|
@ -514,86 +515,33 @@
|
|
|
|
|
|
|
|
|
|
<el-dialog |
|
|
|
|
v-model="dialogVisible" |
|
|
|
|
title="增值服务" |
|
|
|
|
title="客户信息" |
|
|
|
|
width="30%" |
|
|
|
|
:model="addvalue" |
|
|
|
|
:before-close="handleClose" |
|
|
|
|
:model="clientData" |
|
|
|
|
> |
|
|
|
|
<el-form-item label="增值服务" prop="freightMark"> |
|
|
|
|
<el-checkbox-group v-model="form.addvalueType" @change="handleCheckedCitiesChange"> |
|
|
|
|
<el-checkbox |
|
|
|
|
style="width: 100%; margin-bottom: 3%" |
|
|
|
|
v-for="(item, index) in addvalueServeTypeData" |
|
|
|
|
:key="item.dictKey" |
|
|
|
|
:label="item.dictKey" |
|
|
|
|
>{{ item.dictValue }} |
|
|
|
|
<span v-if="index === 0 || index === 6 || index === 2 || index === 4" |
|
|
|
|
> 件数: |
|
|
|
|
<el-input |
|
|
|
|
type="number" |
|
|
|
|
v-model="item.f" |
|
|
|
|
:disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1" |
|
|
|
|
@change="textbox($event, index, 1)" |
|
|
|
|
style="width: 10%; border: none; border-bottom: 2px solid #eee" |
|
|
|
|
/> |
|
|
|
|
</span> |
|
|
|
|
<span v-if="index === 1" |
|
|
|
|
>公里: |
|
|
|
|
<el-input |
|
|
|
|
type="primary" |
|
|
|
|
v-model="item.a" |
|
|
|
|
:disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1" |
|
|
|
|
@change="textbox($event, index, 2)" |
|
|
|
|
style="width: 10%; border: none; border-bottom: 2px solid #eee" |
|
|
|
|
/> |
|
|
|
|
</span> |
|
|
|
|
<span v-if="index === 3" |
|
|
|
|
>距离: |
|
|
|
|
<el-input |
|
|
|
|
type="number" |
|
|
|
|
v-model="item.b" |
|
|
|
|
:disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1" |
|
|
|
|
@change="textbox($event, index, 3)" |
|
|
|
|
style="width: 10%; border: none; border-bottom: 2px solid #eee" |
|
|
|
|
/> |
|
|
|
|
</span> |
|
|
|
|
<span v-if="index === 5" |
|
|
|
|
>人数: |
|
|
|
|
<el-input |
|
|
|
|
type="number" |
|
|
|
|
v-model="item.c" |
|
|
|
|
:disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1" |
|
|
|
|
@change="textbox($event, index, 4)" |
|
|
|
|
style="width: 10%; border: none; border-bottom: 2px solid #eee" |
|
|
|
|
/> |
|
|
|
|
</span> |
|
|
|
|
<span v-if="index === 0" |
|
|
|
|
>楼层: |
|
|
|
|
<el-input |
|
|
|
|
type="number" |
|
|
|
|
v-model="item.d" |
|
|
|
|
:disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1" |
|
|
|
|
@change="textbox($event, index, 5)" |
|
|
|
|
style="width: 10%; border: none; border-bottom: 2px solid #eee" |
|
|
|
|
/> |
|
|
|
|
</span> |
|
|
|
|
<span v-if="item" |
|
|
|
|
>预计费用: |
|
|
|
|
<el-input |
|
|
|
|
type="number" |
|
|
|
|
v-model="item.e" |
|
|
|
|
:disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1" |
|
|
|
|
@change="textbox($event, index, 6)" |
|
|
|
|
style="width: 20%; border: none; border-bottom: 2px solid #eee" |
|
|
|
|
/> |
|
|
|
|
</span> |
|
|
|
|
</el-checkbox> |
|
|
|
|
</el-checkbox-group> |
|
|
|
|
</el-form-item> |
|
|
|
|
<el-row :gutter="24" class="rows" > |
|
|
|
|
<el-col :xl="6" :lg="7" :md="8" :sm="24" > |
|
|
|
|
<div class="clientRow"> |
|
|
|
|
<span >商场名称：{{ clientData.mallName }} </span> |
|
|
|
|
</div> |
|
|
|
|
</el-col> |
|
|
|
|
</el-row> |
|
|
|
|
<el-form :label-position="right" label-width="80px" :model="formLabelAlign"> |
|
|
|
|
<el-form-item label="用户名称:"> |
|
|
|
|
<el-input v-model="clientData.customerName"></el-input> |
|
|
|
|
</el-form-item> |
|
|
|
|
<el-form-item label="用户电话:"> |
|
|
|
|
<el-input v-model="clientData.customerTelephone"></el-input> |
|
|
|
|
</el-form-item> |
|
|
|
|
<el-form-item label="用户地址:"> |
|
|
|
|
<el-input v-model="clientData.customerAddress"></el-input> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-form> |
|
|
|
|
|
|
|
|
|
<template #footer> |
|
|
|
|
<span class="dialog-footer"> |
|
|
|
|
<el-button @click="dialogVisible = false">取消</el-button> |
|
|
|
|
<el-button type="primary" @click="aaa"> 确定(增值服务) </el-button> |
|
|
|
|
<el-button type="primary" @click="submitClient"> 确定(修改客户) </el-button> |
|
|
|
|
</span> |
|
|
|
|
</template> |
|
|
|
|
</el-dialog> |
|
|
|
|
@ -616,9 +564,9 @@ import {
|
|
|
|
|
selectStockArticleInfoList, |
|
|
|
|
selectUpdateAvailableStockArticle, |
|
|
|
|
getZeroOrderDetail, |
|
|
|
|
updateClient |
|
|
|
|
} from '@/api/distribution/distributionStockArticle'; |
|
|
|
|
import { getDetailDelivery } from '@/api/distribution/distributionDelivery'; |
|
|
|
|
import { addIncrement } from '@/api/distribution/distributionStockArticle'; |
|
|
|
|
import { getInventoryList, selectInventoryDetail } from '@/api/distribution/distributionStockList'; |
|
|
|
|
|
|
|
|
|
import option from '@/option/distribution/distributionStockArticle'; |
|
|
|
|
@ -1291,6 +1239,16 @@ export default {
|
|
|
|
|
sortable: true, |
|
|
|
|
head: false, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: '', |
|
|
|
|
label: '操作', |
|
|
|
|
type: 6, |
|
|
|
|
values: '', |
|
|
|
|
width: '200', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: 'right', |
|
|
|
|
hide: true, |
|
|
|
|
}, |
|
|
|
|
], |
|
|
|
|
inventoryInfocolumnList: [ |
|
|
|
|
{ |
|
|
|
|
@ -1742,6 +1700,7 @@ export default {
|
|
|
|
|
data: [], |
|
|
|
|
//增值服务弹窗 |
|
|
|
|
dialogVisible: false, |
|
|
|
|
clientData: {}, |
|
|
|
|
textarea: '', |
|
|
|
|
//增值服务字典列表 |
|
|
|
|
addvalueServeTypeData: [], |
|
|
|
|
@ -1867,44 +1826,6 @@ export default {
|
|
|
|
|
init() { |
|
|
|
|
this.height = this.setPx(document.body.clientHeight - 340); |
|
|
|
|
}, |
|
|
|
|
aaa() { |
|
|
|
|
let addvalueInfos = []; |
|
|
|
|
this.form.addvalueType.forEach((item, index) => { |
|
|
|
|
let addvalueInfo = {}; |
|
|
|
|
addvalueInfo.addvalueId = item; |
|
|
|
|
if (item == 1 || item == 3 || item == 5 || item == 7) { |
|
|
|
|
addvalueInfo.number = this.costList[item]; |
|
|
|
|
} |
|
|
|
|
if (item == 2) { |
|
|
|
|
addvalueInfo.kilometer = this.costList[item]; |
|
|
|
|
} |
|
|
|
|
if (item == 4) { |
|
|
|
|
addvalueInfo.distance = this.costList[item]; |
|
|
|
|
} |
|
|
|
|
if (item == 6) { |
|
|
|
|
addvalueInfo.peopleNum = this.costList[item]; |
|
|
|
|
} |
|
|
|
|
if (this.floorList.length > 1) { |
|
|
|
|
addvalueInfo.floor = this.floorList[1]; |
|
|
|
|
this.floorList = []; |
|
|
|
|
} |
|
|
|
|
addvalueInfo.fee = this.feeList[item]; |
|
|
|
|
addvalueInfos.push(addvalueInfo); |
|
|
|
|
}); |
|
|
|
|
let params = {}; |
|
|
|
|
params.id = this.orderInfo.id; |
|
|
|
|
params.addvalue = addvalueInfos; |
|
|
|
|
params.relatedId = 1; |
|
|
|
|
console.log('params>>>>>>>>>>>>', params); |
|
|
|
|
addIncrement(params).then(res => { |
|
|
|
|
this.dialogVisible = false; |
|
|
|
|
this.$message({ |
|
|
|
|
type: 'success', |
|
|
|
|
message: '操作成功!', |
|
|
|
|
}); |
|
|
|
|
}); |
|
|
|
|
this.onLoad(this.page); |
|
|
|
|
}, |
|
|
|
|
tableAllSelection() {}, |
|
|
|
|
//查询出所有的市配订单 |
|
|
|
|
async handleAddOrder() { |
|
|
|
|
@ -2069,6 +1990,14 @@ export default {
|
|
|
|
|
this.zeroOrderShow = true; |
|
|
|
|
this.isrReservationEntry = false; |
|
|
|
|
}, |
|
|
|
|
submitClient(){ |
|
|
|
|
console.log("this.client===============>",this.clientData); |
|
|
|
|
updateClient(this.clientData).then(res=>{ |
|
|
|
|
console.log("res>>>>>>>>>>>",res.data.data); |
|
|
|
|
this.onLoadOrder(this.page); |
|
|
|
|
this.dialogVisible = false; |
|
|
|
|
}) |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
// 选择包件信息 |
|
|
|
|
// selectionPackageChange(list) { |
|
|
|
|
@ -2393,20 +2322,12 @@ export default {
|
|
|
|
|
} |
|
|
|
|
console.log('>>>>>>>>>>>>>>>row', row); |
|
|
|
|
}, |
|
|
|
|
removeStockList(row) { |
|
|
|
|
if (this.inventoryData.length == 1 && this.orderData.length == 0 && this.reservationId) { |
|
|
|
|
this.$message.warning('最少剩下一个数据'); |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
this.inventoryData.forEach((item, index) => { |
|
|
|
|
if (item.id === row.id) { |
|
|
|
|
this.inventoryData.splice(index, 1); |
|
|
|
|
} |
|
|
|
|
console.log('item>>>>>>>>>>>', item); |
|
|
|
|
}); |
|
|
|
|
// 当两个列表没有数据时, 清空限制 |
|
|
|
|
if (this.inventoryData.length === 0 && this.orderData.length === 0) this.marketName = ''; |
|
|
|
|
updateClient(row) { |
|
|
|
|
console.log('>>>>>>>>>>>>>>>row', row); |
|
|
|
|
this.dialogVisible = true; |
|
|
|
|
Object.assign(this.clientData,row); |
|
|
|
|
console.log("=============>",this.clientData); |
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
showStockListEdit(row) { |
|
|
|
|
console.log('>>>>>>>>>>>>>>>row', row); |
|
|
|
|
@ -2911,4 +2832,13 @@ input[type='number'] {
|
|
|
|
|
margin-bottom: 8px; |
|
|
|
|
border-radius: 4px; |
|
|
|
|
} |
|
|
|
|
.clientRow{ |
|
|
|
|
display: block; |
|
|
|
|
min-height: 1px; |
|
|
|
|
margin-bottom: 32px; |
|
|
|
|
font-size: larger; |
|
|
|
|
margin-left: 24px; |
|
|
|
|
font-weight: bold; |
|
|
|
|
width: 2000px; |
|
|
|
|
} |
|
|
|
|
</style> |
|
|
|
|
|
