|
|
|
@ -128,7 +128,7 @@ |
|
|
|
<el-table-column prop="shipper" width="100" label="货主" align="center" /> |
|
|
|
<el-table-column label="承运商" align="center" width="150"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<el-select v-model="scope.row.carrier" placeholder="请选择" @change="selectCarrier(scope.row,$event)"> |
|
|
|
<el-select v-model="scope.row.carrierValue" placeholder="请选择" @change="selectCarrier(scope.row,$event)"> |
|
|
|
<el-option v-for="(item,i) in carrierList" :key="i" :label="item.dictValue" :value="item.dictKey"> |
|
|
|
</el-option> |
|
|
|
</el-select> |
|
|
|
@ -278,7 +278,7 @@ |
|
|
|
<el-row> |
|
|
|
<el-col :span="8"> |
|
|
|
<div class="span-sty">开票总金额</div> |
|
|
|
<el-form-item> <el-input v-model="from.four.totalAmount" placeholder="" clearable |
|
|
|
<el-form-item> <el-input v-model="totalQuantity" :readonly="true" placeholder="" clearable |
|
|
|
class="addinputInfo addinputw" /></el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :span="8"> |
|
|
|
@ -513,7 +513,9 @@ |
|
|
|
first: [], |
|
|
|
two: [], |
|
|
|
three: {}, |
|
|
|
four: {}, |
|
|
|
four: { |
|
|
|
detailsList: [] |
|
|
|
}, |
|
|
|
five: {}, |
|
|
|
six: [] |
|
|
|
}, |
|
|
|
@ -529,6 +531,21 @@ |
|
|
|
this.init() |
|
|
|
this.loadList() |
|
|
|
}, |
|
|
|
computed: { |
|
|
|
// 开票金额 |
|
|
|
totalQuantity() { |
|
|
|
let quantity = 0 |
|
|
|
if (this.from.four.detailsList.length > 0) { |
|
|
|
this.from.four.detailsList.forEach((e) => { |
|
|
|
quantity += Number(e.salesAmount) |
|
|
|
}) |
|
|
|
} |
|
|
|
|
|
|
|
this.from.four.totalAmount = quantity |
|
|
|
|
|
|
|
return quantity |
|
|
|
}, |
|
|
|
}, |
|
|
|
methods: { |
|
|
|
|
|
|
|
init() { |
|
|
|
@ -592,7 +609,9 @@ |
|
|
|
} |
|
|
|
// 发票信息 |
|
|
|
if (table.name == 'four') { |
|
|
|
this.from.four = {} |
|
|
|
this.from.four = { |
|
|
|
detailsList: [] |
|
|
|
} |
|
|
|
req.orderInvoiveDetail({ |
|
|
|
sid: this.rowItemSid |
|
|
|
}).then((resp) => { |
|
|
|
@ -696,7 +715,9 @@ |
|
|
|
first: [], |
|
|
|
two: [], |
|
|
|
three: {}, |
|
|
|
four: {}, |
|
|
|
four: { |
|
|
|
detailsList: [] |
|
|
|
}, |
|
|
|
five: {}, |
|
|
|
six: [] |
|
|
|
} |
|
|
|
@ -837,7 +858,13 @@ |
|
|
|
}, |
|
|
|
saveInvoice() { |
|
|
|
req.saveOrderInvoive(this.from.four).then((resp) => { |
|
|
|
|
|
|
|
if (res.success) { |
|
|
|
this.$message({ |
|
|
|
type: 'success', |
|
|
|
message: '保存成功', |
|
|
|
showClose: true |
|
|
|
}) |
|
|
|
} |
|
|
|
}).catch(() => {}) |
|
|
|
}, |
|
|
|
chooseGoods() { |
|
|
|
@ -864,16 +891,25 @@ |
|
|
|
|
|
|
|
const choose = this.carrierList.filter((item) => item.dictKey == val) |
|
|
|
console.log('>>>>>>>>>selectCarrier', choose) |
|
|
|
row.carrier = choose[0].dictValue |
|
|
|
row.carrierSid = choose[0].dictKey |
|
|
|
row.carrierValue = choose[0].dictValue |
|
|
|
row.carrierKey = choose[0].dictKey |
|
|
|
|
|
|
|
var query = { |
|
|
|
sid: row.sid, |
|
|
|
carrier: row.carrier, |
|
|
|
carrierSid: row.carrierSid, |
|
|
|
carrierValue: row.carrierValue, |
|
|
|
carrierKey: row.carrierKey, |
|
|
|
userSid: window.sessionStorage.getItem('userSid') |
|
|
|
} |
|
|
|
req.updateCarrier(query).then((res) => {}) |
|
|
|
req.updateCarrier(query).then((res) => { |
|
|
|
if (res.success) { |
|
|
|
this.$message({ |
|
|
|
type: 'success', |
|
|
|
message: '保存成功', |
|
|
|
showClose: true |
|
|
|
}) |
|
|
|
} |
|
|
|
|
|
|
|
}) |
|
|
|
}, |
|
|
|
itemWaybillNumber(row) { |
|
|
|
console.log("itemWaybillNumber", row); |
|
|
|
@ -883,7 +919,15 @@ |
|
|
|
waybillNumber: row.waybillNumber, |
|
|
|
userSid: window.sessionStorage.getItem('userSid') |
|
|
|
} |
|
|
|
req.updateWaybillNumber(query).then((res) => {}) |
|
|
|
req.updateWaybillNumber(query).then((res) => { |
|
|
|
if (res.success) { |
|
|
|
this.$message({ |
|
|
|
type: 'success', |
|
|
|
message: '保存成功', |
|
|
|
showClose: true |
|
|
|
}) |
|
|
|
} |
|
|
|
}) |
|
|
|
|
|
|
|
}, |
|
|
|
showStock(row) { |
|
|
|
@ -930,8 +974,9 @@ |
|
|
|
"count": item.count, |
|
|
|
"rackSid": item.rackSid, |
|
|
|
"rackCode": item.rackCode, |
|
|
|
"inventorySid": item.sid, |
|
|
|
"initialCount": item.initialCount |
|
|
|
"inventorySid": item.inventorySid, |
|
|
|
"initialCount": item.initialCount, |
|
|
|
"locationSid": item.locationSid, |
|
|
|
}) |
|
|
|
} |
|
|
|
} |
|
|
|
@ -941,6 +986,7 @@ |
|
|
|
|
|
|
|
if (res.success) { |
|
|
|
this.dialogVisible2 = false |
|
|
|
this.loadList() |
|
|
|
} else { |
|
|
|
// 根据resp.code进行异常情况处理 |
|
|
|
} |
|
|
|
|
