From b54839da414eb6234507974566228377009440b8 Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Wed, 6 Sep 2023 09:45:08 +0800 Subject: [PATCH 01/19] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue index 09e9149e..d50e3c5d 100644 --- a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue +++ b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue @@ -373,7 +373,7 @@ export default { head: false, }, { - prop: 'warehouseId', + prop: 'warehouseCode', label: '仓库编号', type: 2, values: '', From e0d0a524020a5452b5e98fd0b0acdbf1d303660f Mon Sep 17 00:00:00 2001 From: kilo Date: Wed, 6 Sep 2023 16:53:45 +0800 Subject: [PATCH 02/19] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E3=80=81=E9=A2=84=E7=BA=A6=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=AD=97=E6=AE=B5=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/reservation/reservation.vue | 2840 +++++----- .../reservation/reservationAddFrom.vue | 4797 +++++++++-------- .../reservation/reservationSubmitFrom.vue | 76 +- 3 files changed, 3980 insertions(+), 3733 deletions(-) diff --git a/src/views/distribution/reservation/reservation.vue b/src/views/distribution/reservation/reservation.vue index 8252fb9d..7c8c2912 100644 --- a/src/views/distribution/reservation/reservation.vue +++ b/src/views/distribution/reservation/reservation.vue @@ -1,1458 +1,1522 @@ \ No newline at end of file diff --git a/src/views/distribution/reservation/reservationAddFrom.vue b/src/views/distribution/reservation/reservationAddFrom.vue index 9355f872..c3cda935 100644 --- a/src/views/distribution/reservation/reservationAddFrom.vue +++ b/src/views/distribution/reservation/reservationAddFrom.vue @@ -1,2437 +1,2572 @@ + + + + + + + 提交(配送订单预约) + + 返 回 + - - - 搜 索 - 清 空 - - - - - + + + + + + + + + + + + + + + + + + + + + - -
- - - -
- - - 提交(订单) - 返 回 - - + + + 搜 索 + + 清 空 + + + + + - - - - - - - - - - - - - - - - - - - - - 搜 索 - 清 空 - - - - - - - 提交(库存品) - 返 回 - - + +
+ + + +
+ + + 提交(订单) + + 返 回 + + - - - - - - - - 提交(包件) - 返 回 - - + + + + + + + + + + + + + + + + + + + + + 搜 索 + + 清 空 + + + + + + + 提交(库存品) + + 返 回 + + + + + + + + + + + 提交(包件) + + 返 回 + + - - - - {{ item.dictValue }} -  件数: + + + + {{ item.dictValue }} +  件数: - 公里: + 公里: - 距离: + 距离: - 人数: + 人数: - 楼层: + 楼层: - 预计费用: + 预计费用: - - - - + + + diff --git a/src/views/distribution/reservation/reservationSubmitFrom.vue b/src/views/distribution/reservation/reservationSubmitFrom.vue index 28dd3e3c..39d59f83 100644 --- a/src/views/distribution/reservation/reservationSubmitFrom.vue +++ b/src/views/distribution/reservation/reservationSubmitFrom.vue @@ -117,15 +117,15 @@ - - - - - - - - - + + + + {{item.dictValue}}  + + + + @@ -318,19 +318,19 @@ - + - + - + - + - + @@ -500,6 +500,7 @@ import option from '@/option/distribution/distributionStockArticle'; import { mapGetters } from 'vuex'; import { getDictionaryBiz } from '@/api/system/dict'; + import dayjs from 'dayjs'; export default { data() { @@ -1322,6 +1323,53 @@ this.page.pageSize = pageSize; this.onLoad(this.page); }, + // inputscStockArtic(index, row) { + // console.log(index, row); + // this.query[row.prop] = index; + // this.onLoadOrder(this.page); + // }, + // timescStockArtic(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.onLoadOrder(this.page); + // }, + // btnscStockArtic(index, row) { + // console.log(index, row); + // this.onLoad(this.page); + // }, + // selectscStockArtic(index, row) { + // console.log(index, row); + // if(row.prop ==='reservationStatusName'){ + // this.query['reservationStatus'] = index; + // }else if(row.prop ==='freezeStatusName'){ + // this.query['freezeStatus'] = index; + // }else if(row.prop ==='completeSetName'){ + // this.query['completeSet'] = index; + // } + // // else if(row.prop ==='groundingStatusName'){ + // // this.query['groundingStatus'] = index; + // // }else if(row.prop ==='stockupStatusName'){ + // // this.query['stockupStatus'] = index; + // // }else if(row.prop ==='orderStatusName'){ + // // this.query['orderStatus'] = index; + // // }else if(row.prop ==='typeServerName'){ + // // this.query['typeService'] = index; + // // } + // // else if(row.prop ==='orderReceiveStatusName'){ + // // this.query['orderReceiveStatus'] = index; + // // } + // + // else{ + // this.query[row.prop] = index; + // } + // this.onLoadOrder(this.page); + // }, onLoadOrder(page, params = {}) { this.query.typeService = 2; this.query.genre = '1'; From fad84fdf14d3cc8387eaf6582dfcb7b09c11a10a Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Wed, 6 Sep 2023 17:34:55 +0800 Subject: [PATCH 03/19] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E6=8F=90?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventory/distrilbutionBillLading.vue | 57 ++++++++++++++----- .../inventory/distrilbutionBillLadingList.vue | 4 +- 2 files changed, 46 insertions(+), 15 deletions(-) diff --git a/src/views/distribution/inventory/distrilbutionBillLading.vue b/src/views/distribution/inventory/distrilbutionBillLading.vue index bc512141..6505dedd 100644 --- a/src/views/distribution/inventory/distrilbutionBillLading.vue +++ b/src/views/distribution/inventory/distrilbutionBillLading.vue @@ -1488,7 +1488,7 @@ export default { fixed: false, sortable: true, head: false, - lessThanNum:'available' + lessThanNum:'available' }, { prop: '', @@ -1505,12 +1505,14 @@ export default { }, mounted() { this.init(); - + if (this.$route.query.type == '2') { //查询提货编辑数据 this.getDetailOen(); - } else { + } else if (this.$route.query.type == '1'){ this.onLoad(this.page); + }else if (this.$route.query.type == '3'){ + this.onLoadCj(); } /** * 初始化获取本地缓存的编辑隐藏的列表 @@ -1595,9 +1597,10 @@ export default { if (this.$route.query.type == '2') { //查询提货编辑数据 this.getDetailOen(); - } else { + } else if (this.$route.query.type == '1'){ this.onLoad(this.page); - // this.onLoadOwn(this.page); + }else if (this.$route.query.type == '3'){ + this.onLoadCj(); } }, deep: true, @@ -1848,6 +1851,10 @@ export default { }, //确定 callFordelivery(inde) { + if(this.selectionListStock.length === 0){ + this.$message.warning("至少选择一条数据！"); + return ; + } let isa = false; console.log('执行了'); this.selectionListStock.some(i => { @@ -2348,19 +2355,43 @@ export default { this.selectionClear(); }); }, + /** + * 创建自提 + * @param page + * @param params + */ + onLoadCj(page, params = {}) { + this.orderAdd = true; + }, //库存品 onLoadList(page, params = {}) { this.loading = true; - getListStockList(page.currentPage, page.pageSize, params).then(res => { - const dataOwn = res.data.data; - this.pageStock.total = dataOwn.total; - this.dataOwn = dataOwn.records; - this.dataOwn.forEach(i => { - i.available = i.quantityStock - i.quantityOccupied; + let a = {}; + if(this.$route.query.type == '1'){ + a = this.dataList[0]; + // console.log("11111111111111"); + }else if(this.$route.query.type == '3'){ + a = this.dataOrder[0]; + // console.log("2222222222222"); + } + // let a = this.dataList[0]; + console.log("aaa",a); + if(!!a.mallId){ + params.marketId = a.mallId; + getListStockList(page.currentPage, page.pageSize, params).then(res => { + const dataOwn = res.data.data; + this.pageStock.total = dataOwn.total; + this.dataOwn = dataOwn.records; + this.dataOwn.forEach(i => { + i.available = i.quantityStock - i.quantityOccupied; + }); + this.loading = false; + this.selectionClear(); }); + }else{ this.loading = false; - this.selectionClear(); - }); + this.pageStock.total =0; + } }, //包件信息 onLoadOwn(page, params = {}) { diff --git a/src/views/distribution/inventory/distrilbutionBillLadingList.vue b/src/views/distribution/inventory/distrilbutionBillLadingList.vue index a3dc7bbe..590b1324 100644 --- a/src/views/distribution/inventory/distrilbutionBillLadingList.vue +++ b/src/views/distribution/inventory/distrilbutionBillLadingList.vue @@ -78,7 +78,7 @@
- + 创建自提 自提签收
@@ -908,7 +908,7 @@ export default { this.$router.push({ path: '/distribution/inventory/distrilbutionBillLading', query:{ - type: '1' + type: '3' } }); }, From 7d577e6b35b5c08a4eb72f402fb19799d2271388 Mon Sep 17 00:00:00 2001 From: zhangsiyu Date: Wed, 6 Sep 2023 18:02:27 +0800 Subject: [PATCH 04/19] =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96=E5=85=BC?= =?UTF-8?q?=E5=AE=B9=E4=B8=8D=E8=A7=84=E5=88=99=E6=95=B0=E7=BB=84=EF=BC=8C?= =?UTF-8?q?=E4=B8=8B=E6=9E=B6=E5=92=8C=E4=B8=8A=E6=9E=B6=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/basicdata/basicdataGoodsShelfView.ts | 2 +- src/axios.js | 2 +- src/components/tablecmt/tablecmt.vue | 4 + .../goodsShelf/basicdataGoodsShelfView.vue | 1160 ++++++++++++++--- 4 files changed, 1002 insertions(+), 166 deletions(-) diff --git a/src/api/basicdata/basicdataGoodsShelfView.ts b/src/api/basicdata/basicdataGoodsShelfView.ts index 10e2fcc2..20a9080a 100644 --- a/src/api/basicdata/basicdataGoodsShelfView.ts +++ b/src/api/basicdata/basicdataGoodsShelfView.ts @@ -1,5 +1,5 @@ import request from '@/axios'; -import { AxiosResponse } from 'axios'; // 假设使用Axios发送HTTP请求 +import { AxiosResponse,AxiosRequestConfig } from 'axios'; // 假设使用Axios发送HTTP请求 interface VisualizationResponseData { data: any; // 根据实际返回数据结构进行定义 diff --git a/src/axios.js b/src/axios.js index 6b05cbf4..bc627fa2 100644 --- a/src/axios.js +++ b/src/axios.js @@ -18,7 +18,7 @@ import 'nprogress/nprogress.css'; // progress bar style import { Base64 } from 'js-base64'; import { baseUrl } from '@/config/env'; -axios.defaults.timeout = 10000; +axios.defaults.timeout = 60000; //返回其他状态吗 axios.defaults.validateStatus = function (status) { return status >= 200 && status <= 500; // 默认的 diff --git a/src/components/tablecmt/tablecmt.vue b/src/components/tablecmt/tablecmt.vue index ab95b55b..67e30fbb 100644 --- a/src/components/tablecmt/tablecmt.vue +++ b/src/components/tablecmt/tablecmt.vue @@ -634,4 +634,8 @@ function copyContent(content: string) { display: flex; align-items: center; } + +.el-popper{ + max-width:20% !important; +} diff --git a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue index 454ca95f..d336e472 100644 --- a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue +++ b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue @@ -85,6 +85,12 @@ {{ it.serviceNumber }} +
+
库存品：
+
+ {{ it.name + '--' + it.productCode }} +
+
@@ -101,7 +107,11 @@ : 'itembox' " > -
{{ ite.goodsAllocationName }}
+
{{ ite.layerNum + '层' + '-' + ite.columnNum + '列' }}
+
{{ '包件数:' + ite.packageNum }}
+
{{ '订单数:' + ite.orderNum }}
+
{{ '零担数:' + ite.lessNum }}
+
{{ '库存品数:' + ite.inventoryNum }}
@@ -109,9 +119,22 @@ - - 请选择上架类型 - --> + + +
+
+
+ +
+
+ {{ + isshowdow == 1 + ? '包件' + : isshowdow == 2 + ? '零担' + : isshowdow == 3 + ? '物料编码' + : isshowdow == 4 + ? '托盘' + : '' + }} +
+ +
+
+
+ {{ + isshowdow == 1 + ? '订单自编号' + : isshowdow == 2 + ? '零担' + : isshowdow == 3 + ? '物料名称' + : isshowdow == 4 + ? '托盘' + : '' + }} +
+ +
+
+
+ 搜索 + 重置 + 批量下架 +
+
+
+ + + +
+ + + +
+
+
+ + From 4dd2e6c3d2f4dcab6d680ef4f81cc1ef6ee93c08 Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Thu, 7 Sep 2023 18:01:30 +0800 Subject: [PATCH 06/19] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basicdata/brand/basicClient.vue | 74 +++++++++++++++- .../delivery/distributionStockArticle.vue | 4 +- .../distributionStockArticleDetails.vue | 13 +-- .../inventory/distrilbutionBillLading.vue | 6 +- .../inventory/distrilbutionBillLadingList.vue | 6 +- .../inventory/distrilbutionBillLadingView.vue | 87 +++++++++++++++++++ .../distributionStockupDetailsSelf.vue | 36 ++++++++ .../stockup/distributionStockupDiscuss.vue | 36 ++++---- .../stockup/distributionStockupMarket.vue | 16 ++-- .../stockup/distributionStockupSelf.vue | 16 ++-- .../warehouseWarehousingEntry.vue | 5 +- 11 files changed, 248 insertions(+), 51 deletions(-) diff --git a/src/views/basicdata/brand/basicClient.vue b/src/views/basicdata/brand/basicClient.vue index ea5a83aa..4e5baf54 100644 --- a/src/views/basicdata/brand/basicClient.vue +++ b/src/views/basicdata/brand/basicClient.vue @@ -345,6 +345,7 @@ import { getSelect, getLazyTree, getLazyList, getLazyTreeAll } from '@/api/base/ import { getToken } from '@/utils/auth'; import globalc from '@/api/basicdata/globalc'; import { Base64 } from 'js-base64'; +import dayjs from 'dayjs'; export default { @@ -389,7 +390,7 @@ export default { { prop: 'clientTypeName', label: '客户类型', - type: 2, + type: 3, values: '', width: '150', checkarr: [], @@ -400,7 +401,7 @@ export default { { prop: 'typeServiceName', label: '服务类型', - type: 2, + type: 1, values: '', width: '180', checkarr: [], @@ -628,6 +629,70 @@ 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("123123123",index, row); + if(row.prop ==='clientTypeName'){ + this.query['clientType'] = index; + }else{ + 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); + // console.log(index, row.prop); + this.query[row.prop] = index; + this.onLoad(this.page); + }, + + + handleCommand(command,row){ console.log(command,row) switch (Number(command)) { @@ -807,6 +872,11 @@ export default { getDictionaryBiz('client_type').then(res => { // console.log("字典》》》",res); this.clientType = res.data.data; + this.$functions.checkcColumnList("clientTypeName", this.columnList).checkarr=res.data.data.map(item=>{ + item.value=item.dictKey + item.label=item.dictValue + return item + }); }); //字典 getDictionaryBiz('basic_freight_type').then(res => { diff --git a/src/views/distribution/inventory/delivery/distributionStockArticle.vue b/src/views/distribution/inventory/delivery/distributionStockArticle.vue index 4539c951..e7303461 100644 --- a/src/views/distribution/inventory/delivery/distributionStockArticle.vue +++ b/src/views/distribution/inventory/delivery/distributionStockArticle.vue @@ -6,10 +6,10 @@ - + - + diff --git a/src/views/distribution/inventory/distributionStockArticleDetails.vue b/src/views/distribution/inventory/distributionStockArticleDetails.vue index c9eb2fc9..64b4271a 100644 --- a/src/views/distribution/inventory/distributionStockArticleDetails.vue +++ b/src/views/distribution/inventory/distributionStockArticleDetails.vue @@ -726,8 +726,11 @@ export default { '$route.query.id': { handler(newVal, oldVal) { // console.log(newVal, oldVal); - this.onLoad(this.page); - this.onLoadOwn(this.page); + if(!!this.$route.query.id){ + this.onLoad(this.page); + this.onLoadOwn(this.page); + } + }, deep: true, immediate: true, @@ -1367,7 +1370,7 @@ export default { }, onLoad(page, params = {}) { this.loading = true; - this.query.id = this.$route.query.id; + this.query.ids = this.$route.query.id; getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { const data = res.data.data; // this.page.total = data.total; @@ -1377,10 +1380,10 @@ export default { }); }, onLoadOwn(page, params = {}) { - this.loading = true; + // this.loading = true; this.dataMaterial = false; params = { - stockArticleId: this.$route.query.id, + stockArticleIds: this.$route.query.id, }; getListOwn(page.currentPage, page.pageSize, Object.assign(params, this.queryPage)).then( res => { diff --git a/src/views/distribution/inventory/distrilbutionBillLading.vue b/src/views/distribution/inventory/distrilbutionBillLading.vue index 6505dedd..97ec06c4 100644 --- a/src/views/distribution/inventory/distrilbutionBillLading.vue +++ b/src/views/distribution/inventory/distrilbutionBillLading.vue @@ -2319,7 +2319,7 @@ export default { } }, selectionChangeStock(list) { - console.log('执行了啦啦啦', list); + // console.log('执行了啦啦啦', list); this.selectionListStock = list; }, selectionClear() { @@ -2345,7 +2345,7 @@ export default { onLoad(page, params = {}) { this.loading = true; - params.id = this.$route.query.id; + params.ids = this.$route.query.id; this.orderAdd = false; getListOne(page.currentPage, page.pageSize, params).then(res => { const data = res.data.data; @@ -2396,7 +2396,7 @@ export default { //包件信息 onLoadOwn(page, params = {}) { this.loading = true; - this.query.stockArticleId = this.$route.query.id; + this.query.stockArticleIds = this.$route.query.id; getListOwn(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { console.log('包件信息>>>>', res.data.data); const dataList = res.data.data; diff --git a/src/views/distribution/inventory/distrilbutionBillLadingList.vue b/src/views/distribution/inventory/distrilbutionBillLadingList.vue index 590b1324..83edf040 100644 --- a/src/views/distribution/inventory/distrilbutionBillLadingList.vue +++ b/src/views/distribution/inventory/distrilbutionBillLadingList.vue @@ -105,8 +105,8 @@ @@ -856,7 +856,7 @@ export default { for(let a = 0;a < clientType.length;a++){ // console.log("进来了",clientType[a].dictKey , costListName[i]); if(clientType[a].dictKey == costListName[i]){ - console.log("进来了",clientType[a].dictKey , costListName[i]); + // console.log("进来了",clientType[a].dictKey , costListName[i]); let zhi = costList[costListName[i]]; if(!zhi){ this.pan = true; diff --git a/src/views/distribution/inventory/distrilbutionBillLadingView.vue b/src/views/distribution/inventory/distrilbutionBillLadingView.vue index 7fa36266..de5153a7 100644 --- a/src/views/distribution/inventory/distrilbutionBillLadingView.vue +++ b/src/views/distribution/inventory/distrilbutionBillLadingView.vue @@ -153,6 +153,49 @@ export default { columnListarrs:{ //入库明细 ordoption:[ + { + prop: 'serviceNumber', + label: '服务号', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: true, + sortable: true, + head: false, + }, + { + prop: 'waybillNumber', + label: '运单号', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: true, + sortable: true, + head: false, + }, + { + prop: 'waybillNumber', + label: '客户车次号', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: true, + sortable: true, + head: false, + }, + { + prop: 'sendWarehouseName', + label: '始发仓', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + }, { prop: 'orderCode', label: '订单自编号', @@ -164,6 +207,7 @@ export default { sortable: true, head: false, }, + { prop: 'descriptionGoods', label: '货物名称', @@ -352,6 +396,49 @@ export default { // checkarr: [], // fixed: true, // }, + { + prop: 'serviceNumber', + label: '服务号', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: true, + sortable: true, + head: false, + }, + { + prop: 'waybillNumber', + label: '运单号', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: true, + sortable: true, + head: false, + }, + { + prop: 'orderCode', + label: '订单自编号', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'waybillNumber', + label: '客户车次号', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: true, + sortable: true, + head: false, + }, { prop: 'orderPackageCode', label: '包条码', diff --git a/src/views/distribution/stockup/distributionStockupDetailsSelf.vue b/src/views/distribution/stockup/distributionStockupDetailsSelf.vue index d41ca065..538b162b 100644 --- a/src/views/distribution/stockup/distributionStockupDetailsSelf.vue +++ b/src/views/distribution/stockup/distributionStockupDetailsSelf.vue @@ -599,6 +599,10 @@ export default { //配送类型 this.distributionType = res.data.data; }); + // 费用类型字典 + getDictionaryBiz('delivery_cost').then(res => { + this.clientType = res.data.data; + }); // console.log("配送方式123", this.deliveryWayList); getDictionaryBiz('delivery_way').then(res => { //配送方式 @@ -832,6 +836,38 @@ export default { let a = await billStockList(page.currentPage, page.pageSize, { id: this.$route.query.id }); this.data3 = a.data.data.records; console.log("自提任务》》》》》》",this.data3); + console.log("费用类型lll",this.clientType); + this.data3.forEach(i =>{ + if(!!i.list){ + i.collectFee = 0; + i.storageFee = 0; + i.transport = 0; + i.forklift = 0; + i.otherFee = 0; + i.list.forEach(a =>{ + const { cost, money } = a; // 对象解构，获取a对象的cost和money属性 + switch (cost) { + case '1': // 到付 + i.collectFee = money ? parseInt(money) : 0; + break; + case '2': // 仓储费用 + i.storageFee = money ? parseInt(money) : 0; + break; + case '3': // 搬运费 + console.log("0=-0-="); + i.transport = money ? parseInt(money) : 0; + break; + case '4': // 叉车费 + i.forklift = money ? parseInt(money) : 0; + break; + case '5': // 其他增值费 + i.otherFee = money ? parseInt(money) : 0; + break; + } + }) + } + }); + // if (!!this.data3 && this.data3.length > 0) { // this.data3.forEach(i => { diff --git a/src/views/distribution/stockup/distributionStockupDiscuss.vue b/src/views/distribution/stockup/distributionStockupDiscuss.vue index 5a5ab14b..8a125284 100644 --- a/src/views/distribution/stockup/distributionStockupDiscuss.vue +++ b/src/views/distribution/stockup/distributionStockupDiscuss.vue @@ -355,14 +355,14 @@ export default { values: '', width: '150', checkarr: [ - { - label: '未指派', - value: '1', - }, - { - label: '已指派', - value: '2', - }, + // { + // label: '未指派', + // value: '1', + // }, + // { + // label: '已指派', + // value: '2', + // }, ], fixed: false, sortable: true, @@ -893,17 +893,17 @@ export default { return item }); }); - getDictionaryBiz('stock_allocation').then(res => { - this.stockAllocation = res.data.data; - this.$functions.checkcColumnList("assignStatusName", this.columnList).checkarr = res.data.data.map(item => { - item.value = item.dictKey - item.label = item.dictValue - return item - }); - }) + // getDictionaryBiz('stock_allocation').then(res => { + // this.stockAllocation = res.data.data; + // this.$functions.checkcColumnList("assignStatusName", this.columnList).checkarr = res.data.data.map(item => { + // item.value = item.dictKey + // item.label = item.dictValue + // return item + // }); + // }) getDictionaryBiz('stock_assign_status').then(res => { //指派 - // console.log("8908098080",res.data.data); - this.distributionType = res.data.data; + console.log("8908098080",res.data.data); + // this.distributionType = res.data.data; this.$functions.checkcColumnList("assignStatusName", this.columnList).checkarr =res.data.data.map(item=>{ item.value=item.dictKey item.label=item.dictValue diff --git a/src/views/distribution/stockup/distributionStockupMarket.vue b/src/views/distribution/stockup/distributionStockupMarket.vue index 508ccf01..1f8d26d9 100644 --- a/src/views/distribution/stockup/distributionStockupMarket.vue +++ b/src/views/distribution/stockup/distributionStockupMarket.vue @@ -831,14 +831,14 @@ export default { return item }); }); - getDictionaryBiz('stock_allocation').then(res => { - this.stockAllocation = res.data.data; - this.$functions.checkcColumnList("assignStatusName", this.columnList).checkarr = res.data.data.map(item => { - item.value = item.dictKey - item.label = item.dictValue - return item - }); - }); + // getDictionaryBiz('stock_allocation').then(res => { + // this.stockAllocation = res.data.data; + // this.$functions.checkcColumnList("assignStatusName", this.columnList).checkarr = res.data.data.map(item => { + // item.value = item.dictKey + // item.label = item.dictValue + // return item + // }); + // }); this.onLoad(this.page); }, searchHide () { diff --git a/src/views/distribution/stockup/distributionStockupSelf.vue b/src/views/distribution/stockup/distributionStockupSelf.vue index 028ef25c..67989128 100644 --- a/src/views/distribution/stockup/distributionStockupSelf.vue +++ b/src/views/distribution/stockup/distributionStockupSelf.vue @@ -837,14 +837,14 @@ export default { return item }); }); - getDictionaryBiz('stock_allocation').then(res => { - this.stockAllocation = res.data.data; - this.$functions.checkcColumnList("assignStatusName", this.columnList).checkarr = res.data.data.map(item => { - item.value = item.dictKey - item.label = item.dictValue - return item - }); - }); + // getDictionaryBiz('stock_allocation').then(res => { + // this.stockAllocation = res.data.data; + // this.$functions.checkcColumnList("assignStatusName", this.columnList).checkarr = res.data.data.map(item => { + // item.value = item.dictKey + // item.label = item.dictValue + // return item + // }); + // }); this.onLoad(this.page); }, searchHide () { diff --git a/src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue b/src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue index 16747380..88065123 100644 --- a/src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue +++ b/src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue @@ -50,6 +50,7 @@ From 7b085257bd6526a4b82e6e82f07f0c092230f9ec Mon Sep 17 00:00:00 2001 From: zhangsiyu Date: Thu, 7 Sep 2023 18:01:46 +0800 Subject: [PATCH 07/19] =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/page/index/tags.vue | 12 + .../goodsShelf/basicdataGoodsShelfView.vue | 220 +++++++++--------- 2 files changed, 126 insertions(+), 106 deletions(-) diff --git a/src/page/index/tags.vue b/src/page/index/tags.vue index af4b6617..ff781386 100644 --- a/src/page/index/tags.vue +++ b/src/page/index/tags.vue @@ -39,6 +39,10 @@ + + + + {{ $t('tagsView.menu') }} @@ -189,6 +193,14 @@ export default { }); }); }, + replace(){ + location.replace(location.href) + } }, }; + \ No newline at end of file diff --git a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue index fc3adea4..a96ac54b 100644 --- a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue +++ b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue @@ -374,7 +374,7 @@ Date: Thu, 7 Sep 2023 21:42:40 +0800 Subject: [PATCH 08/19] =?UTF-8?q?1.=E4=BA=8C=E7=BB=B4=E6=95=B0=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/basicdata/basicdataGoodsAllocation.js | 9 ++ src/api/basicdata/basicdataGoodsShelf.js | 18 +-- src/api/basicdata/basicdataTray.js | 28 +++- .../BasicdataGoodsAllocation.vue | 30 +++- .../goodsShelf/basicdataGoodsShelf.vue | 142 +++++++++++------- .../warehouse/tray/basicdataTray.vue | 130 +++++++++++----- 6 files changed, 255 insertions(+), 102 deletions(-) diff --git a/src/api/basicdata/basicdataGoodsAllocation.js b/src/api/basicdata/basicdataGoodsAllocation.js index 62b5a3a4..2d50e59f 100644 --- a/src/api/basicdata/basicdataGoodsAllocation.js +++ b/src/api/basicdata/basicdataGoodsAllocation.js @@ -49,6 +49,15 @@ export const enable = (ids) => { } }) } +export const downAllocation = (ids) => { + return request({ + url: '/api/logpm-warehouse/warehouseGoodsAllocation/downAllocation', + method: 'post', + params: { + ids, + } + }) +} export const shelf = (ids) => { return request({ url: '/api/logpm-warehouse/warehouseGoodsAllocation/downAllocation', diff --git a/src/api/basicdata/basicdataGoodsShelf.js b/src/api/basicdata/basicdataGoodsShelf.js index 968b074f..3fb2c3ef 100644 --- a/src/api/basicdata/basicdataGoodsShelf.js +++ b/src/api/basicdata/basicdataGoodsShelf.js @@ -87,15 +87,15 @@ export const getShowTemplate = (row) => { }) } -export const getPrintTemplate = (ids) => { - return request({ - url: '/api/logpm-basicdata/goodsShelf/getPrintTemplate', - method: 'get', - params:{ - ids - } - }) -} +// export const getPrintTemplate = (ids) => { +// return request({ +// url: '/api/logpm-basicdata/goodsShelf/getPrintTemplate', +// method: 'get', +// params:{ +// ids +// } +// }) +// } export const getQRCodeImg = (qrCode) => { return request({ diff --git a/src/api/basicdata/basicdataTray.js b/src/api/basicdata/basicdataTray.js index 2a387ca7..6ee67a91 100644 --- a/src/api/basicdata/basicdataTray.js +++ b/src/api/basicdata/basicdataTray.js @@ -102,13 +102,32 @@ export const getDetail = (id) => { export const remove = (ids) => { return request({ - url: '/api/logpm-basicdata/Tray/remove', + url: '/api/logpm-basicdata/tray/remove', method: 'post', params: { ids, } }) } +export const disable = (ids) => { + return request({ + url: '/api/logpm-basicdata/tray/disable', + method: 'post', + params: { + ids, + } + }) +} +export const addable = (ids) => { + return request({ + url: '/api/logpm-basicdata/tray/addable', + method: 'post', + params: { + ids, + } + }) +} + export const add = (row) => { return request({ @@ -132,4 +151,11 @@ export const vacant = (row) => { data: row }) } +export const vacants = (row) => { + return request({ + url: '/api/logpm-basicdata/tray/vacants', + method: 'post', + data: row + }) +} diff --git a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue index 170c7cd4..d84f7176 100644 --- a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue +++ b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue @@ -31,6 +31,11 @@ plain @click="handleEnable">启 用 + 一 键 下 架 + @@ -78,7 +83,7 @@ + + \ No newline at end of file diff --git a/src/views/basicdata/brand/basicdataTripartiteMall.vue b/src/views/basicdata/brand/basicdataTripartiteMall.vue index 470b0e20..73115466 100644 --- a/src/views/basicdata/brand/basicdataTripartiteMall.vue +++ b/src/views/basicdata/brand/basicdataTripartiteMall.vue @@ -270,7 +270,7 @@ export default { }, onLoad (page, params = {}) { this.loading = true; - this.query.client = this.$route.query.id; + this.query.clientId = this.$route.query.id; getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { const data = res.data.data; this.page.total = data.total; From 13e1a080dbcf20fde68e1662f22c709650d29c7b Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Fri, 8 Sep 2023 11:15:00 +0800 Subject: [PATCH 10/19] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E6=8F=90?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stockup/distributionStockup.vue | 56 +++++++++---------- .../stockup/distributionStockupDiscuss.vue | 28 +++++----- .../stockup/distributionStockupMarket.vue | 24 ++++---- .../stockup/distributionStockupSelf.vue | 28 +++++----- 4 files changed, 68 insertions(+), 68 deletions(-) diff --git a/src/views/distribution/stockup/distributionStockup.vue b/src/views/distribution/stockup/distributionStockup.vue index fc790c6d..a60ac896 100644 --- a/src/views/distribution/stockup/distributionStockup.vue +++ b/src/views/distribution/stockup/distributionStockup.vue @@ -95,16 +95,16 @@ - - - - - - + + + + + + + + + + - - + + - + @@ -408,16 +408,16 @@ export default { fixed: false, sortable: true, },*/ - { - prop: 'loaderName', - label: '装卸班组', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - }, + // { + // prop: 'loaderName', + // label: '装卸班组', + // type: 2, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // }, { prop: 'fixTime', label: '确认完成备货时间', diff --git a/src/views/distribution/stockup/distributionStockupMarket.vue b/src/views/distribution/stockup/distributionStockupMarket.vue index 1f8d26d9..0a0d4945 100644 --- a/src/views/distribution/stockup/distributionStockupMarket.vue +++ b/src/views/distribution/stockup/distributionStockupMarket.vue @@ -107,7 +107,7 @@ - + - - - - - - + + + + + + + + + + - + @@ -401,7 +401,7 @@ export default { // fixed: false, // sortable: true, // }, - { + /*{ prop: 'loaderName', label: '装卸班组', type: 2, @@ -410,7 +410,7 @@ export default { checkarr: [], fixed: false, sortable: true, - }, + },*/ { prop: 'fixTime', label: '确认完成备货时间', From 123b367372636a9ee4259edb8d8c1d352d0b5593 Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Fri, 8 Sep 2023 17:58:28 +0800 Subject: [PATCH 11/19] =?UTF-8?q?1.=E5=8A=A0=E5=85=A5=E5=8C=85=E6=9D=A1?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../warehouse/tray/basicdataTray.vue | 2 +- .../warehouse/tray/basicdataTrayedt.vue | 47 ++++++++++++- .../warehouse/tray/basicdataTrayhistory.vue | 46 ++++++++++++- .../warehouseStock/warehouseStock.vue | 67 ++++++++++++++++--- 4 files changed, 147 insertions(+), 15 deletions(-) diff --git a/src/views/basicdata/warehouse/tray/basicdataTray.vue b/src/views/basicdata/warehouse/tray/basicdataTray.vue index 34ef9a38..e4436119 100644 --- a/src/views/basicdata/warehouse/tray/basicdataTray.vue +++ b/src/views/basicdata/warehouse/tray/basicdataTray.vue @@ -292,7 +292,7 @@ confirmButtonText: "确定", cancelButtonText: "取消", type: "warning" - }).then(() => { + }) .then(() => { console.log("this.selectionList>>>>>>>>>>>>>>>>>>",this.selectionList); const newList = this.selectionList.map(item => item.palletCode); return vacants(newList); diff --git a/src/views/basicdata/warehouse/tray/basicdataTrayedt.vue b/src/views/basicdata/warehouse/tray/basicdataTrayedt.vue index 9add2718..9828b0ae 100644 --- a/src/views/basicdata/warehouse/tray/basicdataTrayedt.vue +++ b/src/views/basicdata/warehouse/tray/basicdataTrayedt.vue @@ -279,6 +279,18 @@ export default { border: true, selection: true, column: [ + { + label: "服务号", + prop: "serviceNumber", + search: true, + width:"100px" + }, + { + label: "运单号", + prop: "waybillNumber", + search: true, + width:"100px" + }, { label: "包条码", prop: "orderPackageCode", @@ -328,11 +340,42 @@ export default { width:"100px" }, { - label: "运单号", - prop: "waybillNumber", + label: "包件状态", + prop: "orderPackageStatusName", + search: true, + width:"100px" + }, + { + label: "包件冻结状态", + prop: "orderPackageFreezeStatusName", search: true, width:"100px" }, + { + label: "包件上架状态", + prop: "orderPackageGroundingStatusName", + search: true, + width:"100px" + }, + { + label: "包件备货状态", + prop: "orderPackageStockupStatusName", + search: true, + width:"100px" + }, + { + label: "包件预约状态", + prop: "orderPackageReservationStatusName", + search: true, + width:"100px" + }, + { + label: "包件装车状态", + prop: "orderPackageLoadingStatusName", + search: true, + width:"100px" + }, + // { // label: "托盘码", // prop: "pallet", diff --git a/src/views/basicdata/warehouse/tray/basicdataTrayhistory.vue b/src/views/basicdata/warehouse/tray/basicdataTrayhistory.vue index 82460be1..30afccb1 100644 --- a/src/views/basicdata/warehouse/tray/basicdataTrayhistory.vue +++ b/src/views/basicdata/warehouse/tray/basicdataTrayhistory.vue @@ -299,6 +299,18 @@ export default { border: true, selection: true, column: [ + { + label: "服务号", + prop: "serviceNumber", + search: true, + width:"100px" + }, + { + label: "运单号", + prop: "waybillNumber", + search: true, + width:"100px" + }, { label: "包条码", prop: "orderPackageCode", @@ -348,8 +360,38 @@ export default { width:"100px" }, { - label: "运单号", - prop: "waybillNumber", + label: "包件状态", + prop: "orderPackageStatusName", + search: true, + width:"100px" + }, + { + label: "包件冻结状态", + prop: "orderPackageFreezeStatusName", + search: true, + width:"100px" + }, + { + label: "包件上架状态", + prop: "orderPackageGroundingStatusName", + search: true, + width:"100px" + }, + { + label: "包件备货状态", + prop: "orderPackageStockupStatusName", + search: true, + width:"100px" + }, + { + label: "包件预约状态", + prop: "orderPackageReservationStatusName", + search: true, + width:"100px" + }, + { + label: "包件装车状态", + prop: "orderPackageLoadingStatusName", search: true, width:"100px" }, diff --git a/src/views/warehouse/warehouseStock/warehouseStock.vue b/src/views/warehouse/warehouseStock/warehouseStock.vue index 25a39be3..3872242c 100644 --- a/src/views/warehouse/warehouseStock/warehouseStock.vue +++ b/src/views/warehouse/warehouseStock/warehouseStock.vue @@ -79,6 +79,26 @@ export default { sortable: false, head: false, }, + { + prop: 'serviceNumber', + label: '服务号', + type: 2, + values: '', + width: '180', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'waybillNumber', + label: '运单号', + type: 2, + values: '', + width: '180', + checkarr: [], + fixed: false, + sortable: true, + }, { prop: 'orderCode', label: '订单自编码', @@ -170,18 +190,44 @@ export default { sortable: true, }, { - prop: 'warehouseEntryTimeEnd', - label: '入库时间', - type: 2, - values: '', - width: '180', - checkarr: [], - fixed: false, - sortable: true, + label: "包件状态", + prop: "orderPackageStatusName", + search: true, + width:"100px" }, { - prop: 'waybillNumber', - label: '运单号', + label: "包件冻结状态", + prop: "orderPackageFreezeStatusName", + search: true, + width:"100px" + }, + { + label: "包件上架状态", + prop: "orderPackageGroundingStatusName", + search: true, + width:"100px" + }, + { + label: "包件备货状态", + prop: "orderPackageStockupStatusName", + search: true, + width:"100px" + }, + { + label: "包件预约状态", + prop: "orderPackageReservationStatusName", + search: true, + width:"100px" + }, + { + label: "包件装车状态", + prop: "orderPackageLoadingStatusName", + search: true, + width:"100px" + }, + { + prop: 'warehouseEntryTimeEnd', + label: '入库时间', type: 2, values: '', width: '180', @@ -189,6 +235,7 @@ export default { fixed: false, sortable: true, }, + { prop: 'operatorName', label: '操作员', From e55aea531e8de0f04bab0d277daeb586d1a47a23 Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Fri, 8 Sep 2023 17:59:45 +0800 Subject: [PATCH 12/19] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E6=8F=90?= =?UTF-8?q?=E5=A4=87=E8=B4=A7=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/distributionStockup.js | 4 + .../distributionStockArticleDetails.vue | 7 +- .../distributionStockupDetailsSelf.vue | 81 +++++++++++++++++++ .../stockup/distributionStockupSelf.vue | 2 +- 4 files changed, 91 insertions(+), 3 deletions(-) diff --git a/src/option/distribution/distributionStockup.js b/src/option/distribution/distributionStockup.js index 40f5ef02..ce3fff11 100644 --- a/src/option/distribution/distributionStockup.js +++ b/src/option/distribution/distributionStockup.js @@ -724,6 +724,10 @@ export default { label: "备货区", prop: "stockupArea", }, + { + label: "操作", + prop: "stockupArea", + }, ], columnBasic: [ //基本信息 { diff --git a/src/views/distribution/inventory/distributionStockArticleDetails.vue b/src/views/distribution/inventory/distributionStockArticleDetails.vue index 64b4271a..4abe52c3 100644 --- a/src/views/distribution/inventory/distributionStockArticleDetails.vue +++ b/src/views/distribution/inventory/distributionStockArticleDetails.vue @@ -1370,11 +1370,14 @@ export default { }, onLoad(page, params = {}) { this.loading = true; + console.log("执行了查询零零零零"); this.query.ids = this.$route.query.id; - getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { + getDetail(this.$route.query.id).then(res => { + console.log("返回的数据》》》》",res.data.data); const data = res.data.data; // this.page.total = data.total; - this.data = data.records; + this.data[0]= data; + this.loading = false; this.selectionClear(); }); diff --git a/src/views/distribution/stockup/distributionStockupDetailsSelf.vue b/src/views/distribution/stockup/distributionStockupDetailsSelf.vue index 538b162b..c6e70461 100644 --- a/src/views/distribution/stockup/distributionStockupDetailsSelf.vue +++ b/src/views/distribution/stockup/distributionStockupDetailsSelf.vue @@ -225,6 +225,7 @@ + + +
@@ -312,6 +322,25 @@
--> + +
+
+ + +
+ + + 打 印 + 确 定 + 取 消 + + @@ -381,10 +410,14 @@ import { getDictionaryBiz } from '@/api/system/dict'; import { getParcelListOwn, getParcelListOwnSelf } from '@/api/distribution/distributionParcelList'; import { stockUp } from '@/api/basicdata/basicdataGoodsArea'; import { getStockDetail } from '@/api/distribution/distributionStock'; +import { getStockTemplate, showOrderPackgeCode } from '@/api/distribution/distributionStockArticle'; +import { getLodop } from '@/utils/LodopFuncs'; export default { data() { return { + html: null, // 页面包条码内容 + dialogVisible: false, //二维码控制 height: 0, activeName: 'reservation', // 弹框标题 @@ -489,6 +522,54 @@ export default { }, }, methods: { + //打印 + printTemplate() { + let LODOP = getLodop(); + console.log("LODOP>>>>>",LODOP); + // console.log("this.ids>>>>>",this.selectionList); + // if (this.selectionList.length === 0){ + // this.$message.warning("请选择至少一条数据"); + // return; + // } + getStockTemplate({ id: this.materialQRCode.id }).then(res => { + console.log('返回的数据', res.data.data); + let templateData = res.data.data; + // let templateData = "res.data.data"; + // console.log(templateData); + LODOP.PRINT_INITA(1, 1, 900, 660, '测试预览功能'); + LODOP.SET_PRINT_MODE('WINDOW_DEFPRINTER', 'Godex G500'); + LODOP.SET_PRINT_STYLEA(0,"TextNeatRow",true);//允许标点溢出，且英文单词拆开 + // // 设置打印整宽且不变形 + LODOP.SET_PRINT_MODE('PRINT_PAGE_PERCENT', 'Auto-Width'); + // // 设置打印后自动关闭 + LODOP.SET_PRINT_MODE('AUTO_CLOSE_PREWINDOW', 1); + // // data就是一段html文本 + LODOP.ADD_PRINT_HTM('0%', '0%', '100%', '100%', templateData); + // LODOP.PREVIEW(); //预览(预览打印无脚标) + LODOP.PRINT(); //直接打印 + + }); + }, + //查看包条码 + handleQRCode(row) { + // this.title = '查看' + // this.view = true; + // this.box = true; + this.materialQRCode = row; + + let qr = { + ids: row.id, + }; + showOrderPackgeCode(qr).then(res => { + // this.orderPackageCode = res.data + console.log(res.data); + this.html='' + this.html=this.getHtmls(res.data.data.dataList,res.data.data.templateHtml) + + }); + + this.dialogVisible = true; + }, //选择 getForklift(row,ty){ switch (ty){ diff --git a/src/views/distribution/stockup/distributionStockupSelf.vue b/src/views/distribution/stockup/distributionStockupSelf.vue index ee544f12..9b233e44 100644 --- a/src/views/distribution/stockup/distributionStockupSelf.vue +++ b/src/views/distribution/stockup/distributionStockupSelf.vue @@ -65,7 +65,7 @@ > From 43522cf93ea16d947dee00211836b6581169bb1a Mon Sep 17 00:00:00 2001 From: zhangsiyu Date: Mon, 11 Sep 2023 09:51:01 +0800 Subject: [PATCH 13/19] =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../goodsShelf/basicdataGoodsShelfView.vue | 193 +++++++++++++++++- 1 file changed, 186 insertions(+), 7 deletions(-) diff --git a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue index a96ac54b..90f8be39 100644 --- a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue +++ b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue @@ -31,6 +31,8 @@
+ +
导出
总货位: {{ countnumber.cargoNub }} @@ -881,7 +883,7 @@ const showupt = value => { values: '', width: '150', checkarr: [], - fixed: false, + fixed: true, sortable: true, head: false, }, @@ -907,6 +909,17 @@ const showupt = value => { sortable: true, head: false, }, + { + prop: 'waybillNumber', + label: '运单号', + type: 1, + values: '', + width: '200', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, { prop: 'customerName', label: '顾客名字', @@ -934,7 +947,73 @@ const showupt = value => { label: '顾客电话', type: 1, values: '', - width: '260', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'orderPackageStatusName', + label: '包件状态', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'orderPackageStockupStatusName', + label: '包件备货状态', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'orderPackageGroundingStatusName', + label: '包件上架状态', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'orderPackageLoadingStatusName', + label: '包件装车状态', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'orderPackageFreezeStatusName', + label: '包件冻结状态', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'orderPackageReservationStatusName', + label: '包件预约状态', + type: 1, + values: '', + width: '150', checkarr: [], fixed: false, sortable: true, @@ -1021,6 +1100,17 @@ const showupt = value => { sortable: true, head: false, }, + { + prop: 'materialCode', + label: '物料编号', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, { prop: 'orderCode', label: '订单自编号', @@ -1190,12 +1280,11 @@ const alldown = async () => { let data = { allocationId: details.checkite.id, }; - if (!scope.row.enterNum && details.isshowdow == 2) { + if(details.checkselectchangearr.length==0){ proxy.$message({ type: 'error', - message: '请输入下架数量!', + message: '请先勾选数据', }); - return; } let url = ''; switch (details.isshowdow) { @@ -1433,6 +1522,17 @@ const showdown = async value => { sortable: true, head: false, }, + { + prop: 'waybillNumber', + label: '运单号', + type: 1, + values: '', + width: '200', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, { prop: 'firsts', label: '一级品类', @@ -1488,6 +1588,72 @@ const showdown = async value => { sortable: true, head: false, }, + { + prop: 'orderPackageStatusName', + label: '包件状态', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'orderPackageStockupStatusName', + label: '包件备货状态', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'orderPackageGroundingStatusName', + label: '包件上架状态', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'orderPackageLoadingStatusName', + label: '包件装车状态', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'orderPackageFreezeStatusName', + label: '包件冻结状态', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'orderPackageReservationStatusName', + label: '包件预约状态', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, { prop: '', label: '操作', @@ -1561,7 +1727,7 @@ const showdown = async value => { label: '顾客电话', type: 1, values: '', - width: '260', + width: '150', checkarr: [], fixed: false, sortable: true, @@ -1572,7 +1738,7 @@ const showdown = async value => { label: '顾客电话', type: 1, values: '', - width: '260', + width: '150', checkarr: [], fixed: false, sortable: true, @@ -2128,6 +2294,19 @@ const { > .tips { display: flex; align-items: center; + .exprbuts{ + width: 70px; + height: 30px; + color: #666666; + font-size: 12px; + background-color: #fff; + border-radius: 3px; + display: flex; + align-items: center; + justify-content: center; + border: 1.5px solid #E8E8E8; + cursor: pointer; + } > div { margin-left: 20px; } From aa116eeff69a26889b98f9986f0d360346e124c3 Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Mon, 11 Sep 2023 15:04:28 +0800 Subject: [PATCH 14/19] =?UTF-8?q?1.=E9=99=90=E5=88=B6=E8=B4=A7=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/basicdata/basicdataGoodsArea.js | 11 +++++++ .../goodsShelf/basicdataGoodsShelf.vue | 32 +++++++++++-------- 2 files changed, 30 insertions(+), 13 deletions(-) diff --git a/src/api/basicdata/basicdataGoodsArea.js b/src/api/basicdata/basicdataGoodsArea.js index ff2aa322..b5c5e63d 100644 --- a/src/api/basicdata/basicdataGoodsArea.js +++ b/src/api/basicdata/basicdataGoodsArea.js @@ -128,6 +128,17 @@ export const getGoodsAreaNodeList = () => { method: 'get', }) } +/** + * 货区列表信息 + * @param id 仓库ID + * @returns {AxiosPromise} + */ +export const getGoodsAreaoptionList = () => { + return request({ + url: '/api/logpm-basicdata/goodsArea/getAreaoption', + method: 'get', + }) +} /** * 查询当前登录人所能操作的备货区 diff --git a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue index e0faca26..cb294023 100644 --- a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue +++ b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue @@ -124,26 +124,26 @@ - + - + - + - - - - - - - - + + + + @@ -319,11 +319,11 @@