From 89856c1d0db22d85065e885197a4c769cfa754a1 Mon Sep 17 00:00:00 2001 From: kilo Date: Thu, 14 Sep 2023 16:04:16 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=85=8D=E9=80=81=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/distributionStockArticle.js | 20 +++ .../distributionDeliveryListdis.vue | 2 +- .../distributionDeliveryListedt.vue | 168 +++++++++--------- .../distributionDeliveryListmar.vue | 3 +- .../reservation/reservationSubmitFrom.vue | 14 +- .../signfor/distributionSignforedt.vue | 10 +- 6 files changed, 120 insertions(+), 97 deletions(-) diff --git a/src/option/distribution/distributionStockArticle.js b/src/option/distribution/distributionStockArticle.js index 7a4cc9b2..9efa4b12 100644 --- a/src/option/distribution/distributionStockArticle.js +++ b/src/option/distribution/distributionStockArticle.js @@ -628,6 +628,14 @@ export default { label: '顾客地址', prop: 'customerAddress' }, + { + label: '库位信息', + prop: 'allocation' + }, + { + label: '托盘信息', + prop: 'trays' + }, // { // label: '增值服务', // prop: 'fee' @@ -845,6 +853,18 @@ export default { prop: 'customerAddress', width: '100' + }, + { + label: '库位信息', + prop: 'allocation', + width: '100' + + }, + { + label: '托盘信息', + prop: 'trays', + width: '100' + }, // { // label: '增值服务', diff --git a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue index 864722d4..e2bba40a 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue @@ -117,7 +117,7 @@ diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue index d33d61aa..9e559ab5 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue @@ -235,15 +235,15 @@ @selectCheck="selectsc" @selection="selectionChange" > - + + + + + + + + + @@ -1315,28 +1315,30 @@ export default { sortable: true, head: false, }, - { - prop: 'signeeName', - label: '签收人', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'sjsigningTime', - label: '签收时间', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, + // ———————————————————————————————————————————————————————— + // { + // prop: 'signeeName', + // label: '签收人', + // type: 2, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + // { + // prop: 'sjsigningTime', + // label: '签收时间', + // type: 4, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + // ———————————————————————————————————————————————————————— // { // prop: 'deliveryNumber', // label: '备货数', @@ -1368,27 +1370,27 @@ export default { // fixed: false, // sortable: true, // }, - { - prop: 'cargoNumber', - label: '物料编号', - type: 3, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - }, - { - prop: 'cargoUnit', - label: '单位', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, + // { + // prop: 'cargoNumber', + // label: '物料编号', + // type: 3, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // }, + // { + // prop: 'cargoUnit', + // label: '单位', + // type: 2, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, { prop: 'pallet', label: '托盘码', @@ -1400,37 +1402,37 @@ export default { sortable: true, head: false, }, - { - prop: 'goodsAllocation', - label: '库位信息', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - prop: 'goodsAllocation', - label: '签收人', - type: 1, - values: '', - width: '180', - checkarr: [], - fixed: false, - sortable: true, - }, - { - prop: 'readyStock', - label: '签收时间', - type: 1, - values: '', - width: '180', - checkarr: [], - fixed: false, - sortable: true, - }, + // { + // prop: 'goodsAllocation', + // label: '库位信息', + // type: 2, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + // { + // prop: 'goodsAllocation', + // label: '签收人', + // type: 1, + // values: '', + // width: '180', + // checkarr: [], + // fixed: false, + // sortable: true, + // }, + // { + // prop: 'readyStock', + // label: '签收时间', + // type: 1, + // values: '', + // width: '180', + // checkarr: [], + // fixed: false, + // sortable: true, + // }, { prop: '', label: '操作', diff --git a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue index d0eb2d32..495ba47c 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue @@ -111,7 +111,8 @@ diff --git a/src/views/distribution/reservation/reservationSubmitFrom.vue b/src/views/distribution/reservation/reservationSubmitFrom.vue index 39d59f83..9408a2ec 100644 --- a/src/views/distribution/reservation/reservationSubmitFrom.vue +++ b/src/views/distribution/reservation/reservationSubmitFrom.vue @@ -404,13 +404,13 @@ - - - + + + + + + + 提交(包件) diff --git a/src/views/distribution/signfor/distributionSignforedt.vue b/src/views/distribution/signfor/distributionSignforedt.vue index 6da9598d..84186c34 100644 --- a/src/views/distribution/signfor/distributionSignforedt.vue +++ b/src/views/distribution/signfor/distributionSignforedt.vue @@ -279,11 +279,11 @@ - - - + + + + + From 90c1f15a4f277b8f69dbbc4d10942f172f7a677e Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Thu, 14 Sep 2023 18:25:54 +0800 Subject: [PATCH 2/3] =?UTF-8?q?1.=E5=AF=BC=E5=87=BA=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basic/material/basicMaterial.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/views/basic/material/basicMaterial.vue b/src/views/basic/material/basicMaterial.vue index 4c15ac52..9f80a960 100644 --- a/src/views/basic/material/basicMaterial.vue +++ b/src/views/basic/material/basicMaterial.vue @@ -96,12 +96,12 @@ tip: '请上传 .xls,.xlsx 标准格式文件', action: '/api/logpm-basic/material/import-basicMaterial', }, - // { - // label: '模板下载', - // prop: 'excelTemplate', - // formslot: true, - // span: 24, - // }, + { + label: '模板下载', + prop: 'excelTemplate', + formslot: true, + span: 24, + }, ], }, }; @@ -251,7 +251,7 @@ handleTemplate() { console.log("下载模板！！！"); exportBlob( - `/api/logpm-warehouse/warehouseWarehousingEntry/export-warehouseWarehousingEntry?${this.website.tokenHeader}=${getToken()}` + `/api/logpm-basic/material/export-basicMaterialMb?${this.website.tokenHeader}=${getToken()}` ).then(res => { downloadXls(res.data, '物料数据模板.xlsx'); }); From 21e76becb7207363c42dee147eb5250f1c755801 Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Thu, 14 Sep 2023 18:32:23 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=8F=98=E9=87=8F=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventory/delivery/distributionStockArticleMarket.vue | 4 ++-- .../inventory/delivery/distributionStockArticleSelf.vue | 4 ++-- src/views/distribution/stockup/distributionStockupDetails.vue | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue index bb7bbf0c..a635ab02 100644 --- a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue +++ b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue @@ -1072,11 +1072,11 @@ export default { if(!st){ //查询库存数据 // console.log("cxcxcxc",i); - let aa = await getListOwn(this.page.currentPage,this.page.pageSize,{ stockArticleId : i.id } ).then(); + let aa = await getListOwn(this.page.currentPage,this.page.pageSize,{ stockArticleIds : i.id } ).then(); // console.log("包件物料不存在！！",aa.data.data.records); aa.data.data.records.forEach( l =>{ console.log(!l.materialId , !l.materialName , !l.materialCode , !l.materialUnit); - if(!l.materialId || l.materialId == '-1' ){ + if(!l.materialId ){ lost = true; } }) diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue index 40a95798..5914ff94 100644 --- a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue +++ b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue @@ -1278,11 +1278,11 @@ export default { if(!st){ //查询库存数据 // console.log("cxcxcxc",i); - let aa = await getListOwn(this.page.currentPage,this.page.pageSize,{ stockArticleId : i.id } ).then(); + let aa = await getListOwn(this.page.currentPage,this.page.pageSize,{ stockArticleIds : i.id } ).then(); // console.log("包件物料不存在！！",aa.data.data.records); aa.data.data.records.forEach( l =>{ console.log(!l.materialId , !l.materialName , !l.materialCode , !l.materialUnit); - if(!l.materialId || l.materialId == '-1' ){ + if(!l.materialId ){ lost = true; } }) diff --git a/src/views/distribution/stockup/distributionStockupDetails.vue b/src/views/distribution/stockup/distributionStockupDetails.vue index 2b11e11d..29522c37 100644 --- a/src/views/distribution/stockup/distributionStockupDetails.vue +++ b/src/views/distribution/stockup/distributionStockupDetails.vue @@ -83,7 +83,7 @@ >