|
@@ -100,12 +100,11 @@
|
|
|
<!-- <el-button type="text" size="mini" style="padding:4px 10px;float:left" @click="commodityChoice(row)" :disabled="detailData.seeDisabled || !row.$cellEdit || arrivalDisabled || deliverDisabled">选择</el-button>-->
|
|
|
<span>{{ row.code }}</span>
|
|
|
</template>
|
|
|
- <!-- <template>
|
|
|
+ <template slot="storageId" slot-scope="{row}">
|
|
|
<div>
|
|
|
- <avue-curd v-if="row.$cellEdit" v-model="row.storageId" :dict="storageDict" type="select" />
|
|
|
- <span v-else>{{ getStorageName(row.storageId) }}</span>
|
|
|
+ <span >{{ row.storageName }}</span>
|
|
|
</div>
|
|
|
- </template> -->
|
|
|
+ </template>
|
|
|
|
|
|
<template slot-scope="{row,index}" slot="menu">
|
|
|
<el-button type="text" size="small" @click="rowCell(row, index)"
|
|
@@ -717,7 +716,6 @@ export default {
|
|
|
this.statusOption = res.data.data
|
|
|
})
|
|
|
storageType().then(res => {
|
|
|
- console.log('1', res.data.data);
|
|
|
this.storageIdOption = res.data.data.records
|
|
|
|
|
|
})
|
|
@@ -760,10 +758,6 @@ export default {
|
|
|
})
|
|
|
gainUser().then(res => {
|
|
|
this.userList = res.data.data;
|
|
|
- console.log(this.userList);
|
|
|
- console.log(this.warehouseName);
|
|
|
-
|
|
|
-
|
|
|
});
|
|
|
if (this.detailData.id) {
|
|
|
let id = this.detailData.id
|
|
@@ -790,7 +784,10 @@ export default {
|
|
|
return item.goodType == 1
|
|
|
})
|
|
|
this.giftData.forEach(item => {
|
|
|
+ // console.log(item);
|
|
|
this.$set(item, 'deliveryAmount', item.amount)
|
|
|
+ this.$set(item,'storageId',item.storageId)
|
|
|
+ this.$set(item,'storageName',item.storageName)
|
|
|
this.$set(item, 'specificationAndModel', item.itemType)
|
|
|
this.$set(item, 'orgOrderNo', this.form.orgOrderNo)
|
|
|
this.$set(item, 'srcOrderNo', this.form.srcOrderNo)
|
|
@@ -831,6 +828,8 @@ export default {
|
|
|
delete item.updateUser
|
|
|
})
|
|
|
this.contactsData.forEach(item => {
|
|
|
+ this.$set(item,'storageId',item.storageId)
|
|
|
+ this.$set(item,'storageName',item.storageName)
|
|
|
this.$set(item, 'containerVolume', item.cntrVolumn)
|
|
|
this.$set(item, 'actualWeight', item.cartonWeight)
|
|
|
this.$set(item, 'specificationAndModel', item.itemType)
|
|
@@ -930,7 +929,6 @@ export default {
|
|
|
}
|
|
|
if (this.form.storageMap) {
|
|
|
this.configurationWarehouse.dicData = this.form.storageMap
|
|
|
- console.log('1'.this.configurationWarehouse.dicData);
|
|
|
}
|
|
|
let feesData = []
|
|
|
this.form.deliveryFeesList.forEach(item => {
|
|
@@ -1529,7 +1527,10 @@ export default {
|
|
|
getGoodsList = this.goodsShowData
|
|
|
getGiftList = this.giftData
|
|
|
}
|
|
|
- if (contrastObj(this.form, this.oldForm) ||
|
|
|
+ // console.log('1234',this.getGoodsList);
|
|
|
+ // console.log('5678',this.oldGoodsList);
|
|
|
+ if (
|
|
|
+ contrastObj(this.form, this.oldForm) ||
|
|
|
contrastList(getGoodsList, this.oldGoodsList) ||
|
|
|
contrastList(getGiftList, this.oldGiftList) ||
|
|
|
// contrastList(getFeeList, this.oldFeesList) ||
|