diff --git a/src/option/distribution/distributionStockup.js b/src/option/distribution/distributionStockup.js index db61fd1d..009bb327 100644 --- a/src/option/distribution/distributionStockup.js +++ b/src/option/distribution/distributionStockup.js @@ -302,7 +302,8 @@ export default { }, { label: "包条码", - prop: "packetBarCode", + prop: "orderPackageCode", + search: true, }, { label: "一级品", diff --git a/src/option/distribution/distrilbutionBillLading.js b/src/option/distribution/distrilbutionBillLading.js index 9174f05d..1c9a7ede 100644 --- a/src/option/distribution/distrilbutionBillLading.js +++ b/src/option/distribution/distrilbutionBillLading.js @@ -759,7 +759,7 @@ export default { }, { label: "包条码", - prop: "packetBarCode", + prop: "orderPackageCode", }, { label: "一级品", diff --git a/src/views/distribution/inventory/distrilbutionBillLading.vue b/src/views/distribution/inventory/distrilbutionBillLading.vue index 088356e4..38f6f9a5 100644 --- a/src/views/distribution/inventory/distrilbutionBillLading.vue +++ b/src/views/distribution/inventory/distrilbutionBillLading.vue @@ -1366,12 +1366,12 @@ export default { console.log(file); }, textbox(e,index) { - let a = this.costListName.findIndex(i => i== index+1); - console.log("aaaa",a); + let nu = index+1 ; + let a = this.costListName[index]; + // console.log("<><><><>",e,nu); + // console.log("aaaa",a); + this.costList[nu] = e; if(!!a){ - - // console.log("e,index",e,index); - this.costList[index+1] = e; //计算合计费用 let n = 0; this.costList.forEach( i =>{ @@ -1383,15 +1383,12 @@ export default { }, handleCheckedCitiesChange(value) { - console.log(">>>>>>>",value ); + // console.log(">>>>>>>",value ); if(value.length < 1){ this.costList = []; this.costListName = []; } - // console.log("字典",this.clientType); - // console.log("选择的",this.costListName); - // console.log("价格",this.costList); this.clientType.forEach(i =>{ if(value.includes(i.dictKey)){ console.log(i); @@ -1400,6 +1397,9 @@ export default { } }); + // console.log("字典",this.clientType); + console.log("选择的",this.costListName); + console.log("价格",this.costList); let n = 0; value.forEach(s =>{ let a = this.costList[s]; diff --git a/src/views/distribution/stockup/distributionStockupDetails.vue b/src/views/distribution/stockup/distributionStockupDetails.vue index c0b0008d..9863ede6 100644 --- a/src/views/distribution/stockup/distributionStockupDetails.vue +++ b/src/views/distribution/stockup/distributionStockupDetails.vue @@ -419,8 +419,10 @@ export default { getDictionaryBiz('distribution_type').then(res => { //配送类型 this.distributionType = res.data.data; }); + // console.log("配送方式123", this.deliveryWayList); getDictionaryBiz('delivery_way').then(res => { //配送方式 this.deliveryWayList = res.data.data; + console.log("配送方式123", this.deliveryWayList); }); getDictionaryBiz('stockup_status').then(res => { //配送方式 this.stockupStatusList = res.data.data; @@ -635,7 +637,7 @@ export default { this.loading = true; this.query.id = this.$route.query.id; getDetailStockupOwn(this.$route.query.id).then(res => { - // console.log("返回的值",res.data.data); + console.log("返回的值",res.data.data); const data = res.data.data; this.data[0] = data; const { serveType, deliveryWay, deliveryType } = this.data[0]; @@ -678,7 +680,7 @@ export default { //查询包件列表 async getStockUpParcelsList(page){ let a = await getParcelListOwn(page.currentPage,page.pageSize,{id :this.$route.query.id}); - // console.log("包件...",a.data); + console.log("包件...",a.data); const data = a.data.data; this.data1 = data.records; this.data1.forEach(i =>{ @@ -726,11 +728,11 @@ export default { //转换类型 getOwnServer(row,name,list){ // console.log(">>>>>",row,name,list); - console.log(">>>>>",row); - console.log(">>>>>",name); - console.log(">>>>>",list); + // console.log(">>>>>",row); + // console.log(">>>>>",name); + // console.log(">>>>>",list); row.forEach( i =>{ - console.log(i,"-=-=-=-"); + // console.log(i,"-=-=-=-"); let a = list.find( s => s.dictKey == i); // console.log("aaaa",a); if(!!a){ diff --git a/src/views/distribution/stockup/distributionStockupDiscuss.vue b/src/views/distribution/stockup/distributionStockupDiscuss.vue index d630a1d1..86636ea1 100644 --- a/src/views/distribution/stockup/distributionStockupDiscuss.vue +++ b/src/views/distribution/stockup/distributionStockupDiscuss.vue @@ -270,6 +270,16 @@ export default { fixed: true, }, { + prop: 'stockupCode', + label: '备货编码', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: true, + sortable: true, + head: false, + }, { prop: 'stockupDate', label: '备货时间', type: 4, diff --git a/src/views/distribution/stockup/distributionStockupMarket.vue b/src/views/distribution/stockup/distributionStockupMarket.vue index 50206ab5..54e81140 100644 --- a/src/views/distribution/stockup/distributionStockupMarket.vue +++ b/src/views/distribution/stockup/distributionStockupMarket.vue @@ -251,6 +251,17 @@ export default { checkarr: [], fixed: true, }, + { + prop: 'stockupCode', + label: '备货编码', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: true, + sortable: true, + head: false, + }, { prop: 'stockupDate', label: '备货时间',