|
|
@ -48,6 +48,7 @@
|
|
|
|
<jnpf-form-tip-item label="对方订单号" v-if="judgeShow('counterpartOrderCode')"
|
|
|
|
<jnpf-form-tip-item label="对方订单号" v-if="judgeShow('counterpartOrderCode')"
|
|
|
|
prop="counterpartOrderCode">
|
|
|
|
prop="counterpartOrderCode">
|
|
|
|
<JnpfInput v-model="dataForm.counterpartOrderId"
|
|
|
|
<JnpfInput v-model="dataForm.counterpartOrderId"
|
|
|
|
|
|
|
|
:disabled="judgeWrite('counterpartOrderCode')"
|
|
|
|
@change="changeData('counterpartOrderCode', -1)" placeholder="请输入" clearable
|
|
|
|
@change="changeData('counterpartOrderCode', -1)" placeholder="请输入" clearable
|
|
|
|
:style='{ "width": "100%" }'>
|
|
|
|
:style='{ "width": "100%" }'>
|
|
|
|
</JnpfInput>
|
|
|
|
</JnpfInput>
|
|
|
@ -58,6 +59,7 @@
|
|
|
|
prop="expectArriveDateStart">
|
|
|
|
prop="expectArriveDateStart">
|
|
|
|
<JnpfDatePicker v-model="dataForm.expectReturnCargoTimeStart"
|
|
|
|
<JnpfDatePicker v-model="dataForm.expectReturnCargoTimeStart"
|
|
|
|
@change="changeData('expectArriveDateStart', -1)"
|
|
|
|
@change="changeData('expectArriveDateStart', -1)"
|
|
|
|
|
|
|
|
:disabled="judgeWrite('expectArriveDateStart')"
|
|
|
|
:startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
|
|
|
|
:startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
|
|
|
|
placeholder="请选择" clearable :style='{ "width": "100%" }' type="date"
|
|
|
|
placeholder="请选择" clearable :style='{ "width": "100%" }' type="date"
|
|
|
|
format="yyyy-MM-dd">
|
|
|
|
format="yyyy-MM-dd">
|
|
|
@ -68,7 +70,8 @@
|
|
|
|
<jnpf-form-tip-item label="退货方式" v-if="judgeShow('deliveryType')" prop="deliveryType">
|
|
|
|
<jnpf-form-tip-item label="退货方式" v-if="judgeShow('deliveryType')" prop="deliveryType">
|
|
|
|
<JnpfSelect v-model="dataForm.returnCargoWay" @change="changeData('deliveryType', -1)"
|
|
|
|
<JnpfSelect v-model="dataForm.returnCargoWay" @change="changeData('deliveryType', -1)"
|
|
|
|
placeholder="请选择" clearable :style='{ "width": "100%" }'
|
|
|
|
placeholder="请选择" clearable :style='{ "width": "100%" }'
|
|
|
|
:options="returnCargoWayOptions" :props="returnCargoWayProps">
|
|
|
|
:disabled="judgeWrite('deliveryType')" :options="returnCargoWayOptions"
|
|
|
|
|
|
|
|
:props="returnCargoWayProps">
|
|
|
|
</JnpfSelect>
|
|
|
|
</JnpfSelect>
|
|
|
|
</jnpf-form-tip-item>
|
|
|
|
</jnpf-form-tip-item>
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
@ -621,7 +624,7 @@
|
|
|
|
<el-table :data="dataForm.deliveryProductRelationList" size='mini'>
|
|
|
|
<el-table :data="dataForm.deliveryProductRelationList" size='mini'>
|
|
|
|
<el-table-column type="index" width="50" label="序号" align="center" />
|
|
|
|
<el-table-column type="index" width="50" label="序号" align="center" />
|
|
|
|
<el-table-column label="商品名称" v-if="judgeShow('deliveryproductrelation-productId')"
|
|
|
|
<el-table-column label="商品名称" v-if="judgeShow('deliveryproductrelation-productId')"
|
|
|
|
prop="productId">
|
|
|
|
prop="productId" width="200">
|
|
|
|
<template slot="header">
|
|
|
|
<template slot="header">
|
|
|
|
<span class="required-sign"
|
|
|
|
<span class="required-sign"
|
|
|
|
v-if="judgeRequired('deliveryproductrelationList-productId')">*</span>商品名称
|
|
|
|
v-if="judgeRequired('deliveryproductrelationList-productId')">*</span>商品名称
|
|
|
@ -710,14 +713,20 @@
|
|
|
|
v-if="judgeRequired('deliveryproductrelationList-deliveryUnit')">*</span>退货单位
|
|
|
|
v-if="judgeRequired('deliveryproductrelationList-deliveryUnit')">*</span>退货单位
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<JnpfSelect v-model="scope.row.deliveryUnit"
|
|
|
|
<!-- <JnpfSelect v-model="scope.row.deliveryUnit"
|
|
|
|
@change="changeData('deliveryproductrelation-deliveryUnit', scope.$index)"
|
|
|
|
@change="changeData('deliveryproductrelation-deliveryUnit', scope.$index)"
|
|
|
|
placeholder="请选择"
|
|
|
|
placeholder="请选择"
|
|
|
|
:disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-deliveryUnit')"
|
|
|
|
:disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-deliveryUnit')"
|
|
|
|
clearable :style='{ "width": "100%" }'
|
|
|
|
clearable :style='{ "width": "100%" }'
|
|
|
|
:options="scope.row.deliveryproductrelationdeliveryUnitOptions"
|
|
|
|
:options="scope.row.deliveryproductrelationdeliveryUnitOptions"
|
|
|
|
:props="deliveryproductrelationdeliveryUnitProps">
|
|
|
|
:props="deliveryproductrelationdeliveryUnitProps">
|
|
|
|
</JnpfSelect>
|
|
|
|
</JnpfSelect> -->
|
|
|
|
|
|
|
|
<JnpfInput v-model="scope.row.deliveryUnit"
|
|
|
|
|
|
|
|
@change="changeData('deliveryproductrelation-deliveryUnit', scope.$index)"
|
|
|
|
|
|
|
|
placeholder="请输入"
|
|
|
|
|
|
|
|
:disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-deliveryUnit')"
|
|
|
|
|
|
|
|
clearable :style='{ "width": "100%" }'>
|
|
|
|
|
|
|
|
</JnpfInput>
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column label="毛重" v-if="judgeShow('deliveryproductrelation-grossWeight')"
|
|
|
|
<el-table-column label="毛重" v-if="judgeShow('deliveryproductrelation-grossWeight')"
|
|
|
@ -869,8 +878,7 @@
|
|
|
|
v-if="judgeRequired('deliveryproductrelationList-returnUnit')">*</span>退货单价
|
|
|
|
v-if="judgeRequired('deliveryproductrelationList-returnUnit')">*</span>退货单价
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<JnpfInput v-model="scope.row.returnUnit"
|
|
|
|
<JnpfInput v-model="scope.row.returnUnit" @input="priceCount(scope.row)"
|
|
|
|
@change="changeData('deliveryproductrelation-returnUnit', scope.$index)"
|
|
|
|
|
|
|
|
placeholder="请输入"
|
|
|
|
placeholder="请输入"
|
|
|
|
:disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-returnUnit')"
|
|
|
|
:disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-returnUnit')"
|
|
|
|
clearable :style='{ "width": "100%" }'>
|
|
|
|
clearable :style='{ "width": "100%" }'>
|
|
|
@ -1271,6 +1279,14 @@ export default {
|
|
|
|
this.initPurchaseData();
|
|
|
|
this.initPurchaseData();
|
|
|
|
},
|
|
|
|
},
|
|
|
|
methods: {
|
|
|
|
methods: {
|
|
|
|
|
|
|
|
//根据输入退货单价计算总价和不含税单价、不含税总价
|
|
|
|
|
|
|
|
priceCount(row) {
|
|
|
|
|
|
|
|
if (row.deliveryNum) {
|
|
|
|
|
|
|
|
row.taxCount = this.jnpf.floatMul(row.deliveryNum, row.returnUnit).toFixed(2) //采购含税总价
|
|
|
|
|
|
|
|
row.notTaxPrice = this.jnpf.floatDiv(row.returnUnit, this.jnpf.floatAdd(1, this.jnpf.floatDiv(row.tax, 100))).toFixed(6) //采购不含税单价
|
|
|
|
|
|
|
|
row.notTaxCount = this.jnpf.floatMul(row.deliveryNum, row.notTaxPrice).toFixed(2) //采购不含税总价
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
},
|
|
|
|
//选择商品弹窗
|
|
|
|
//选择商品弹窗
|
|
|
|
choiceProduct() {
|
|
|
|
choiceProduct() {
|
|
|
|
this.BomgoodsBoxVisible = true
|
|
|
|
this.BomgoodsBoxVisible = true
|
|
|
@ -1350,24 +1366,16 @@ export default {
|
|
|
|
this.dataForm.deliveryVoucherRelationList.push(item)
|
|
|
|
this.dataForm.deliveryVoucherRelationList.push(item)
|
|
|
|
let productEntity = {}
|
|
|
|
let productEntity = {}
|
|
|
|
e.warehousingStorageProductEntityList.forEach(item => {
|
|
|
|
e.warehousingStorageProductEntityList.forEach(item => {
|
|
|
|
debugger
|
|
|
|
const obj = this.productByOrderList.find(e => e.productId == item.productId) || {}
|
|
|
|
if (item.orderMainUnitIds) {
|
|
|
|
|
|
|
|
var unitName = JSON.parse(item.orderMainUnitIds);
|
|
|
|
|
|
|
|
var optArray = [];
|
|
|
|
|
|
|
|
for (let i = 0; i < unitName.length; i++) {
|
|
|
|
|
|
|
|
item.deliveryUnit = unitName[0];
|
|
|
|
|
|
|
|
var opt = {};
|
|
|
|
|
|
|
|
opt.fullName = unitName[i];
|
|
|
|
|
|
|
|
opt.id = unitName[i];
|
|
|
|
|
|
|
|
optArray.push(opt);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
item.deliveryproductrelationdeliveryUnitOptions = optArray;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
const obj = this.productByOrderList.find(e => e.productId == item.id) || {}
|
|
|
|
|
|
|
|
item.salesMainUnitId = obj.salesMainUnitId
|
|
|
|
item.salesMainUnitId = obj.salesMainUnitId
|
|
|
|
item.saleNum = obj.businessNum
|
|
|
|
item.saleNum = obj.businessNum
|
|
|
|
item.receivedQuantity = obj.receivedQuantity
|
|
|
|
item.tax = obj.tax
|
|
|
|
item.inventoryUnitId = item.inventoryUnitIds
|
|
|
|
item.receivedQuantity = item.netWeight
|
|
|
|
|
|
|
|
item.deliveryNum = item.netWeight
|
|
|
|
|
|
|
|
item.cargoId = item.storageAreaId
|
|
|
|
|
|
|
|
item.batchNo = item.batchNumber
|
|
|
|
|
|
|
|
item.produceTime = item.dateManufacture
|
|
|
|
|
|
|
|
item.deliveryUnit = item.storageUnit
|
|
|
|
item.businessType = "2"
|
|
|
|
item.businessType = "2"
|
|
|
|
productEntity = item
|
|
|
|
productEntity = item
|
|
|
|
})
|
|
|
|
})
|
|
|
@ -1408,10 +1416,6 @@ export default {
|
|
|
|
this.dataForm.reservedFields1 = val2.businessLineId
|
|
|
|
this.dataForm.reservedFields1 = val2.businessLineId
|
|
|
|
val2.businessOrderProductRelationalList.forEach((item, index) => {
|
|
|
|
val2.businessOrderProductRelationalList.forEach((item, index) => {
|
|
|
|
this.productIdList.push(item.productId)
|
|
|
|
this.productIdList.push(item.productId)
|
|
|
|
// item.productName = item.name
|
|
|
|
|
|
|
|
// item.purchaseUnitId = item.salesMainUnitId
|
|
|
|
|
|
|
|
// item.purchaseNum = item.businessNum
|
|
|
|
|
|
|
|
// item.businessType = "2"
|
|
|
|
|
|
|
|
})
|
|
|
|
})
|
|
|
|
this.productByOrderList = val2.businessOrderProductRelationalList
|
|
|
|
this.productByOrderList = val2.businessOrderProductRelationalList
|
|
|
|
},
|
|
|
|
},
|
|
|
|