From 57637c300767e3b1bb9e56f3e72a507340e1e216 Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Tue, 12 Sep 2023 11:51:42 +0800 Subject: [PATCH 1/3] =?UTF-8?q?1.=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue index f6a5dce1..e3544589 100644 --- a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue +++ b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue @@ -524,6 +524,7 @@ function initpage() { } function handleExportArea() { let id=details.arrlist[details.checkselect]?.id||0 + let name=details.arrlist[details.checkselect]?.name||'' if (id ===0){ proxy.$message({ type: "success", @@ -543,7 +544,7 @@ function handleExportArea() { }).then(() => { NProgress.start(); exportBlob(downloadUrl, values).then(res => { - downloadXls(res.data, `仓库${dateNow()}.xlsx`); + downloadXls(res.data, name+`${dateNow()}.xlsx`); NProgress.done(); }) }); From 0d5a86a513133b03bf983cad2fbc471418a29308 Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Tue, 12 Sep 2023 14:39:24 +0800 Subject: [PATCH 2/3] =?UTF-8?q?1.=E8=B4=A7=E5=8C=BAid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../goodsShelf/basicdataGoodsShelf.vue | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue index cb294023..21e72d3c 100644 --- a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue +++ b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue @@ -768,6 +768,8 @@ export default { getGoodsAreaoptionList().then(res=>{ const data = res.data.data; this.areaoption = data + console.log("this.areaoption>>>>>>>>>>>>>",this.areaoption + ); }) getTemplateData("9").then(res=>{ console.log(res.data.data); @@ -925,16 +927,16 @@ export default { if (!this.form.id) { console.log("this.form>>>>>>>", this.form); console.log("this.optioner>>>>>>>", this.optioner); - if (!!this.form.goodsAreaId && this.form.goodsAreaId.length > 1){ - //这里需要截取最后一个ID - let a = this.form.goodsAreaId; - this.form.goodsAreaId = a[a.length - 1]; - } - this.optioner.map(item => { - if (item.id == this.form.goodsAreaId) { - this.form.goodsAreaName = item.headline - } - }) + // if (!!this.form.goodsAreaId && this.form.goodsAreaId.length > 1){ + // //这里需要截取最后一个ID + // let a = this.form.goodsAreaId; + // this.form.goodsAreaId = a[a.length - 1]; + // } + // this.optioner.map(item => { + // if (item.id == this.form.goodsAreaId) { + // this.form.goodsAreaName = item.headline + // } + // }) add(this.form).then(() => { this.box = false; this.onLoad(this.page); From 7456dbb94347f9b1d3b4276c1763559ec91b4ffd Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Tue, 12 Sep 2023 17:27:08 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E5=93=81=E6=89=B9=E9=87=8F=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventory/distrilbutionBillLading.vue | 16 +- .../stockup/distributionStockupDetails.vue | 6 + .../distributionStockupDetailsSelf.vue | 296 +++++++++++++++++- 3 files changed, 303 insertions(+), 15 deletions(-) diff --git a/src/views/distribution/inventory/distrilbutionBillLading.vue b/src/views/distribution/inventory/distrilbutionBillLading.vue index 97ec06c4..bc9dfa8b 100644 --- a/src/views/distribution/inventory/distrilbutionBillLading.vue +++ b/src/views/distribution/inventory/distrilbutionBillLading.vue @@ -1856,18 +1856,26 @@ export default { return ; } let isa = false; - console.log('执行了'); + // console.log('执行了'); this.selectionListStock.some(i => { - console.log('asdgfasdv', i); + // console.log('提交的值《》《》', i); if (parseInt(i.inventoryQuantity) > parseInt(i.quantityStock)) { // this.$message.warning("添加数量大于可以数量"); isa = true; return; } let a = this.data.filter(ele => ele.id == i.id).length >= 1; - // console.log("asdgfasdv",a); + // console.log("相同的值",a); if (!a) { + // console.log("相同了"); this.data.push(i); + }else if(a){ + this.data.forEach( ii =>{ + // console.log("里面的值",ii); + if(ii.id == i.id && parseInt(ii.inventoryQuantity)+parseInt(i.inventoryQuantity) < ii.quantityStock){ + ii.inventoryQuantity = parseInt(ii.inventoryQuantity)+parseInt(i.inventoryQuantity); + } + }); } }); @@ -1877,7 +1885,7 @@ export default { }, //数量校验 handleNumberRange(e, row) { - console.log('执行了2222', e, e.target.value, row); + // console.log('执行了2222', e, e.target.value, row); if (e.target.value) { e.target.value = e.target.value.replace(/[^\.\d]/g, ''); //替换掉与数字无关的字符（中英文与符号都会被替换掉，只留下数字，此时值类型为字符串） if (e.target.value) { diff --git a/src/views/distribution/stockup/distributionStockupDetails.vue b/src/views/distribution/stockup/distributionStockupDetails.vue index 1ee84f8a..a3fc8b84 100644 --- a/src/views/distribution/stockup/distributionStockupDetails.vue +++ b/src/views/distribution/stockup/distributionStockupDetails.vue @@ -976,6 +976,7 @@ export default { }; getPrintDetail(qr).then( res =>{ console.log(",./"); + this.dialogVisible = true; this.html='' this.html=this.getHtmls(res.data.data.dataList,res.data.data.templateHtml) }) @@ -995,6 +996,7 @@ export default { //库存品订单批量 getPrintDetail(qr).then( res =>{ // console.log(",./"); + this.dialogVisible = true; this.html='' this.html=this.getHtmls(res.data.data.dataList,res.data.data.templateHtml) }) @@ -1008,6 +1010,7 @@ export default { row.type = "1"; getPrintDetail(row).then( res =>{ console.log(",./"); + this.dialogVisible = true; this.html='' this.html=this.getHtmls(res.data.data.dataList,res.data.data.templateHtml) }) @@ -1029,11 +1032,14 @@ export default { if(!!i){ let a = {}; a.sku = i.sku; + a.id = i.id; a.orderCode = i.orderCode; a.descriptionGoods = i.descriptionGoods; a.cargoUnit = i.cargoUnit; a.stockPackageCode = i.stockPackageCode; a.brandName = i.brandName; + a.stockListId = i.stockListId; + a.reservationId = i.reservationId; s.push(a); } }); diff --git a/src/views/distribution/stockup/distributionStockupDetailsSelf.vue b/src/views/distribution/stockup/distributionStockupDetailsSelf.vue index 17152635..256e8496 100644 --- a/src/views/distribution/stockup/distributionStockupDetailsSelf.vue +++ b/src/views/distribution/stockup/distributionStockupDetailsSelf.vue @@ -249,7 +249,7 @@ - 批量打印 + 批量打印 + -
- lmy 666 + 批量打印 + + + + + +
+ + +
- 打 印 + 确 定 取 消 @@ -419,20 +454,110 @@ import option from '@/option/distribution/distributionStockup'; import { mapGetters } from 'vuex'; import { getDictionaryBiz } from '@/api/system/dict'; import { getParcelListOwn, getParcelListOwnSelf } from '@/api/distribution/distributionParcelList'; -import { getDisStockList } from '@/api/distribution/disStockListDetail' +import { getDisStockList, getPrintDetail } from '@/api/distribution/disStockListDetail'; import { stockUp } from '@/api/basicdata/basicdataGoodsArea'; import { getStockDetail } from '@/api/distribution/distributionStock'; import { getStockTemplate, showOrderPackgeCode } from '@/api/distribution/distributionStockArticle'; import { getLodop } from '@/utils/LodopFuncs'; +import dayjs from 'dayjs'; export default { data() { return { - html: null, // 页面包条码内容 + html: '', // 页面包条码内容 dialogVisible: false, //二维码控制 dialogPack: false, //包件控制 height: 0, activeName: 'reservation', + packageCodeList: [], + columnInventoryBatch:[ + { + prop: '', + label: '序号', + type: 0, + values: '', + width: 55, + checkarr: [], + fixed: true, + }, + { + prop: 'sku', + label: 'SKU', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: true, + sortable: true, + head: false, + }, + { + prop: 'orderCode', + label: '订单编号', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'descriptionGoods', + label: '物料名称', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'cargoUnit', + label: '单位', + type: 1, + values: '', + width: '100', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'stockPackageCode', + label: '包条码', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'brandName', + label: '品牌', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: '', + label: '操作', + type: 6, + values: '', + width: '230', + checkarr: [], + fixed: 'right', + hide: true, + }, + + ], // 弹框标题 title: '', // 是否展示弹框 @@ -535,20 +660,169 @@ export default { }, }, methods: { - //查询库存包件明细 + showdrawer(value){ + this.drawerShow=value + }, + /** + * 弹窗的勾选回调，用于更改头部数组 + * 固定搭配，只需要更换 columnList + */ + setnewcolum(newarr, headarr,type) { + // console.log(newarr,'+++++++++++') + if(type==1){ + this.columnList = newarr; + this.$functions.setStorage(window.location.pathname+'checkList', headarr); + }else if(type==2){ + this.columnList = newarr; + this.$functions.setStorage(window.location.pathname+'flexList', headarr); + }else if(type==3){ + this.columnList = newarr; + this.$functions.setStorage(window.location.pathname+'sortlist', headarr); + } + + }, + selectionsc(value) { + console.log(value); + }, + delectsolt(scope) { + const { row } = scope; + console.log(row); + }, + editsolt(scope) { + const { row } = scope; + console.log(row); + }, + btnsc(index, row) { + console.log(index, row); + }, + selectsc(index, row) { + console.log(index, row); + // if(row.prop =='typeServiceName'){ + // this.query['typeService'] = index; + // }else if(row.prop =='stockupStatusName'){ + // this.query["stockupStatus"] = index; + // }else if(row.prop =='assignStatusName'){ + // this.query["assignStatus"] = index; + // }else{ + // this.query[row.prop] = index; + // } + // // this.query[row.prop] = index; + // this.onLoad(this.page); + }, + timesc(index, row) { + console.log(index, row); + if (!!index){ + index = dayjs(index).format('YYYY-MM-DD'); + } + this.query[row.prop] = index + if (!index){ + delete this.query[row.prop] + } + this.onLoad(this.page); + }, + inputsc(index, row) { + console.log(index, row); + /* if(row.prop =='typeServiceName'){ + this.query['typeService'] = index; + }else if(row.prop =='stockupStatusName'){ + this.query["stockupStatus"] = index; + }else if(row.prop =='assignStatusName'){ + this.query["assignStatus"] = index; + }else{ + this.query[row.prop] = index; + }*/ + this.query[row.prop] = index; + + this.onLoad(this.page); + }, + //批量打印 + handleBatchDetail(type){ + console.log("selectionList",this.selectionList); + if(this.selectionList.length == 0){ + this.$message.warning("至少选择一条数据！！") + return ; + } + if(type== '1'){ + //包条码批量 + let checkcode=[] + this.selectionList.map(item=>{ + console.log("item>>>",item); + checkcode.push(item.id) + }) + let qr = { + ids: checkcode.join(','), + type: "2" + }; + getPrintDetail(qr).then( res =>{ + console.log(",./"); + this.dialogVisible = true; + this.html='' + this.html=this.getHtmls(res.data.data.dataList,res.data.data.templateHtml) + }) + }else if(type== '2'){ +//包条码批量 + let myMap = []; + this.selectionList.map(item=>{ + if(!!item.stocklist){ + myMap.push(item.stocklist); + } + }) + let qr = { + ids: myMap.join(","), + type: "3" + }; + console.log("><><>>",qr); + //库存品订单批量 + getPrintDetail(qr).then( res =>{ + // console.log(",./"); + this.dialogVisible = true; + this.html='' + this.html=this.getHtmls(res.data.data.dataList,res.data.data.templateHtml) + }) + + } + }, + //单独打印 + handlePrintDetail(row){ + console.log("单个答应》》》",row); + row.type = "1"; + getPrintDetail(row).then( res =>{ + console.log(",./"); + this.dialogVisible = true; + this.html='' + this.html=this.getHtmls(res.data.data.dataList,res.data.data.templateHtml) + }) + + }, onDetail(row){ - // + this.selectionList = []; + console.log("row>><><><",row); this.dialogPack = true; - console.log("row>>>",row); //查询信息 let po = { stockListId: row.stockListId, - reservationId: row.billLadingId, + reservationId: row.reservationId, } + let s =[]; getDisStockList(po).then( res =>{ console.log("res>>>>库存包件码",res.data.data); + res.data.data.forEach(i => { + if(!!i){ + let a = {}; + a.sku = i.sku; + a.id = i.id; + a.orderCode = i.orderCode; + a.descriptionGoods = i.descriptionGoods; + a.cargoUnit = i.cargoUnit; + a.stockPackageCode = i.stockPackageCode; + a.brandName = i.brandName; + a.stockListId = i.stockListId; + a.reservationId = i.reservationId; + s.push(a); + } + }); + this.packageCodeList = s; }) - }, //打印 printTemplate() {