From b23259c14c762f4d74b8e3490143b3e033e2ae95 Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Mon, 21 Aug 2023 16:12:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E6=8F=90=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/distributionParcelList.js | 11 ++ src/api/distribution/distributionStockup.js | 22 +++ .../distribution/distributionStockup.js | 133 +++++++++++++++++- .../distribution/distrilbutionBillLading.js | 8 +- .../distributionStockArticleDetails.vue | 2 +- .../inventory/distrilbutionBillLading.vue | 8 +- .../inventory/distrilbutionBillLadingList.vue | 32 ++--- .../distributionStockupDetailsSelf.vue | 16 +-- .../stockup/distributionStockupSelf.vue | 19 ++- 9 files changed, 215 insertions(+), 36 deletions(-) diff --git a/src/api/distribution/distributionParcelList.js b/src/api/distribution/distributionParcelList.js index 782340d3..216e4ed4 100644 --- a/src/api/distribution/distributionParcelList.js +++ b/src/api/distribution/distributionParcelList.js @@ -54,6 +54,17 @@ export const getParcelListOwn = (current, size, params) => { } }) } +export const getParcelListOwnSelf = (current, size, params) => { + return request({ + url: '/api/logpm-distribution/distributionParcelList/parcelListOwnSelf', + method: 'get', + params: { + ...params, + current, + size, + } + }) +} export const getDetail = (id) => { return request({ diff --git a/src/api/distribution/distributionStockup.js b/src/api/distribution/distributionStockup.js index 08bcc52b..e68bcaa2 100644 --- a/src/api/distribution/distributionStockup.js +++ b/src/api/distribution/distributionStockup.js @@ -48,6 +48,17 @@ export const getDetailOrderOwn = (current, size, params) => { } }) } +export const getDetailOrderOwnSelf = (current, size, params) => { + return request({ + url: '/api/logpm-distribution/distributionStockup/detailOrderOwnSelf', + method: 'get', + params: { + ...params, + current, + size, + } + }) +} export const getDetailStockupOwn = (id) => { return request({ url: '/api/logpm-distribution/distributionStockup/detailOwn', @@ -69,6 +80,17 @@ export const getDetailInventoryOwn = (current, size, params) => { } }) } +export const getDetailInventoryOwnSelf = (current, size, params) => { + return request({ + url: '/api/logpm-distribution/distributionStockup/inventoryOwnSelf', + method: 'get', + params: { + ...params, + current, + size, + } + }) +} export const getDetailReservationOwn = (current, size, params) => { return request({ diff --git a/src/option/distribution/distributionStockup.js b/src/option/distribution/distributionStockup.js index b6de107a..40f5ef02 100644 --- a/src/option/distribution/distributionStockup.js +++ b/src/option/distribution/distributionStockup.js @@ -5,6 +5,137 @@ export default { selection: true, columnReservation: [ // 备货订单 + { + label: "主键", + prop: "id", + display: false, + hide: true, + }, + { + label: "租户号", + prop: "tenantId", + display: false, + hide: true, + }, + { + label: "创建人", + prop: "createUser", + display: false, + hide: true, + }, + { + label: "创建时间", + prop: "createTime", + display: false, + hide: true, + }, + { + label: "更新人", + prop: "updateUser", + display: false, + hide: true, + }, + { + label: "更新时间", + prop: "updateTime", + display: false, + hide: true, + }, + { + label: "状态", + prop: "status", + display: false, + hide: true, + }, + { + label: "是否已删除", + prop: "isDeleted", + display: false, + hide: true, + }, + { + label: "创建部门", + prop: "createDept", + display: false, + hide: true, + }, + // { + // label: "备货时间", + // prop: "stockupDate", + // format: "YYYY-MM-DD hh:mm:ss", + // valueFormat: "YYYY-MM-DD hh:mm:ss", + // }, + // { + // label: "配送单号", + // prop: "stockupUser", + // }, + { + label: "收货人", + prop: "consignee", + search: true, + }, + { + label: "收货电话", + prop: "deliveryPhone", + search: true, + }, + { + label: "收货地址", + prop: "deliveryAddress", + search: true, + }, + { + label: "收货单位", + prop: "mallName", + }, + { + label: "订单自编号", + prop: "stockArticleId", + display: false, + }, + // { + // label: "配送单号", + // prop: "reserve2", + // display: false, + // }, + { + label: "备货状态", + prop: "stockupStatusName", + display: false, + }, + // { + // label: "配送状态", + // prop: "reserve4", + // display: false, + // }, + /* { + label: "装车件数", + prop: "reserve5", + display: false, + }, + { + label: "签收件数", + prop: "reserve3", + display: false, + }, + { + label: "回库件数", + prop: "reserve4", + display: false, + }, + { + label: "是否加急", + prop: "reserve5", + display: false, + }, + { + label: "状态", + prop: "reserve5", + display: false, + },*/ + ], + columnReservationSelf: [ // 备货订单 + { prop: 'pickupBatch', label: '提货批次', @@ -27,7 +158,7 @@ export default { sortable: true, }, { - prop: 'waybillNumber ', + prop: 'waybillNumber', label: '运单号', type: 2, values: '', diff --git a/src/option/distribution/distrilbutionBillLading.js b/src/option/distribution/distrilbutionBillLading.js index 1c9a7ede..c14f52ce 100644 --- a/src/option/distribution/distrilbutionBillLading.js +++ b/src/option/distribution/distrilbutionBillLading.js @@ -1022,11 +1022,17 @@ export default { head: false, }, { - prop: 'waybillNumber ', + prop: 'waybillNumber', label: '运单号', width: '150', head: false, }, + { + prop: 'orderPackageCode', + label: '包条码', + width: '150', + + }, { prop: 'orderCode', label: '订单自编号', diff --git a/src/views/distribution/inventory/distributionStockArticleDetails.vue b/src/views/distribution/inventory/distributionStockArticleDetails.vue index 3c8e470d..1877274d 100644 --- a/src/views/distribution/inventory/distributionStockArticleDetails.vue +++ b/src/views/distribution/inventory/distributionStockArticleDetails.vue @@ -146,7 +146,7 @@ type="primary" text icon="el-icon-view" - v-if="slotProps.scope.row.materialId == '' || slotProps.scope.row.materialId == '-1'" + v-if="!slotProps.scope.row.materialId" @click="handleMaterial(slotProps.scope.row)" >补充物料信息 diff --git a/src/views/distribution/inventory/distrilbutionBillLading.vue b/src/views/distribution/inventory/distrilbutionBillLading.vue index 2f9794b2..9d634319 100644 --- a/src/views/distribution/inventory/distrilbutionBillLading.vue +++ b/src/views/distribution/inventory/distrilbutionBillLading.vue @@ -1289,10 +1289,10 @@ export default { } }) //待打开 - // if(ad){ - // this.$message.warning("请选择同一收货人！！"); - // return ; - // } + if(ad){ + this.$message.warning("请选择同一收货人！！"); + return ; + } if(st){ return ; } diff --git a/src/views/distribution/inventory/distrilbutionBillLadingList.vue b/src/views/distribution/inventory/distrilbutionBillLadingList.vue index c3800a92..0dfe6a67 100644 --- a/src/views/distribution/inventory/distrilbutionBillLadingList.vue +++ b/src/views/distribution/inventory/distrilbutionBillLadingList.vue @@ -966,7 +966,7 @@ export default { }); }, handleEdits (row) { - + this.$router.push({ path: '/distribution/inventory/distrilbutionBillLading', query:{ @@ -1052,18 +1052,16 @@ export default { }, getTime(dat){ let date = new Date(dat); - var y = date.getFullYear() - var m = date.getMonth() + 1 - m = m < 10 ? '0' + m : m - var d = date.getDate() - d = d < 10 ? '0' + d : d - var h = date.getHours() - h = h < 10 ? '0' + h : h - var minute = date.getMinutes() - minute = minute < 10 ? '0' + minute : minute - var s = date.getSeconds() - s = s < 10 ? '0' + s : s - return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + s; + let formatter = new Intl.DateTimeFormat('en', { + year: 'numeric', + month: '2-digit', + day: '2-digit', + hour: '2-digit', + minute: '2-digit', + second: '2-digit' + }); + let formattedDate = formatter.format(date); + return formattedDate.replace(/\//g, '-'); }, onLoad (page, params = {}) { this.loading = true; @@ -1075,9 +1073,11 @@ export default { } getListOwnNUm(params).then(res =>{ console.log("查询数量!!!",res.data.data); - this.treatNum = !res.data.data.treatNum ? 0 : res.data.data.treatNum; - this.stopNum = !res.data.data.stopNum ? 0 : res.data.data.stopNum; - this.numBill = parseInt(this.treatNum) + parseInt(this.stopNum); + if(!!res.data.data){ + this.treatNum = !res.data.data.treatNum ? 0 : parseInt(res.data.data.treatNum); + this.stopNum = !res.data.data.stopNum ? 0 : res.data.data.stopNum; + this.numBill = parseInt(this.treatNum) + parseInt(this.stopNum); + } }); getListOwn(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { const data = res.data.data; diff --git a/src/views/distribution/stockup/distributionStockupDetailsSelf.vue b/src/views/distribution/stockup/distributionStockupDetailsSelf.vue index f29221cd..23bc7faa 100644 --- a/src/views/distribution/stockup/distributionStockupDetailsSelf.vue +++ b/src/views/distribution/stockup/distributionStockupDetailsSelf.vue @@ -92,7 +92,7 @@ :align="center" > -