|
|
@@ -41,7 +41,7 @@
|
|
|
<el-input
|
|
|
placeholder=""
|
|
|
v-model="row.receiveQuantity"
|
|
|
- :disabled="type == 'receipt' && itemData.sendStatus == 4"
|
|
|
+ :disabled="type == 'receipt' && (itemData.sendStatus == 4 || itemData.sendStatus == 3)"
|
|
|
>
|
|
|
<template slot="append">{{ row.measuringUnit }}</template>
|
|
|
</el-input>
|
|
|
@@ -230,16 +230,16 @@
|
|
|
return this.statusMap[Number(status)] || { label: '驳回', type: 'success' };
|
|
|
},
|
|
|
|
|
|
- open(item, type) {
|
|
|
+ open(item, type, detailType) {
|
|
|
this.visible = true;
|
|
|
this.type = type;
|
|
|
this.title = this.type != 'receipt' ? '发货单' : '收货单';
|
|
|
this.itemData = item;
|
|
|
this.id = item.id;
|
|
|
- this.getDetail(item.id);
|
|
|
+ this.getDetail(item.id, detailType);
|
|
|
},
|
|
|
|
|
|
- async getDetail(id) {
|
|
|
+ async getDetail(id, type) {
|
|
|
let detailType = this.type == 'receipt' ? 2 : 1;
|
|
|
const params = {
|
|
|
id,
|
|
|
@@ -249,10 +249,15 @@
|
|
|
params.detailType = 1;
|
|
|
}
|
|
|
|
|
|
+ //用type来区分收货详情与收货 存在type则是收货
|
|
|
if(this.type === "receipt") {
|
|
|
params.detailType = 4;
|
|
|
}
|
|
|
|
|
|
+ if(this.type === 'receipt' && type) {
|
|
|
+ params.detailType = type;
|
|
|
+ }
|
|
|
+
|
|
|
await pleaseEntrustGoodsDetail(params).then(async (res) => {
|
|
|
this.goodsList = [];
|
|
|
res.data.forEach((item) => {
|