From aa555abd8263b846e2930d7e1578dae90c33d1d6 Mon Sep 17 00:00:00 2001 From: kilo Date: Wed, 20 Sep 2023 17:58:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E7=AD=BE=E6=94=B6=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=A2=9E=E5=80=BC=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/addvalue/distributionAddvalue.js | 2 + src/api/basicdata/basicdataGoodsArea.js | 7 + src/api/distribution/distributionSignfor.js | 16 + .../distribution/reservation/reservation.vue | 24 +- .../reservation/reservationAddFrom.vue | 16 +- .../signfor/distributionSignforedt.vue | 3781 ++++++++++------- 6 files changed, 2223 insertions(+), 1623 deletions(-) diff --git a/src/api/addvalue/distributionAddvalue.js b/src/api/addvalue/distributionAddvalue.js index b6cb9cac..bd615d2d 100644 --- a/src/api/addvalue/distributionAddvalue.js +++ b/src/api/addvalue/distributionAddvalue.js @@ -48,3 +48,5 @@ export const update = (row) => { }) } + + diff --git a/src/api/basicdata/basicdataGoodsArea.js b/src/api/basicdata/basicdataGoodsArea.js index b5c5e63d..8c9e5fea 100644 --- a/src/api/basicdata/basicdataGoodsArea.js +++ b/src/api/basicdata/basicdataGoodsArea.js @@ -22,6 +22,13 @@ export const stockUp = ( params) => { }) } +export const getStockUpArea = () => { + return request({ + url: '/api/logpm-basicdata/goodsArea/getStockUpArea', + method: 'get', + }) +} + export const getDetail = (id) => { return request({ url: '/api/logpm-basicdata/goodsArea/detail', diff --git a/src/api/distribution/distributionSignfor.js b/src/api/distribution/distributionSignfor.js index ce5972df..37095791 100644 --- a/src/api/distribution/distributionSignfor.js +++ b/src/api/distribution/distributionSignfor.js @@ -55,6 +55,8 @@ export const getDetail = (id) => { }) } + + export const getDetailById = (id) => { return request({ url: '/api/logpm-distribution/signfor/detailById', @@ -132,3 +134,17 @@ export const getLocationAddress = (signforId) => { }) } + +/** + * 查询对应的增值服务列表信息 + * @param row + * @returns {AxiosPromise} + */ +export const addvalueInfoList = (row) => { + return request({ + url: '/api/logpm-distribution/signfor/addvalueInfoList', + method: 'post', + data: row + }) +} + diff --git a/src/views/distribution/reservation/reservation.vue b/src/views/distribution/reservation/reservation.vue index 7483a283..aa6cd4b1 100644 --- a/src/views/distribution/reservation/reservation.vue +++ b/src/views/distribution/reservation/reservation.vue @@ -404,7 +404,7 @@ import { getPostList } from '@/api/system/post'; import { getListOwn } from '@/api/system/user'; import { getListTeam } from '@/api/basicdata/basicdataTeamGroup'; - import { stockUp } from '@/api/basicdata/basicdataGoodsArea'; + import { stockUp ,getStockUpArea} from '@/api/basicdata/basicdataGoodsArea'; import dayjs from 'dayjs'; export default { @@ -1234,6 +1234,22 @@ this.goodsAreaIdData = fo; }); }, + + //备货区 + async getStockUpArea() { + getStockUpArea().then(res => { + // console.log("res>>>",res.data.data); + let fo = []; + res.data.data.forEach(i => { + let v = { + dictKey: i.id, + dictValue: i.name + '-' + i.headline + }; + fo.push(v); + }); + this.goodsAreaIdData = fo; + }); + }, searchHide() { this.search = !this.search; }, @@ -1368,9 +1384,9 @@ } this.dialogFormCustomer = true; this.info.stockupDate = dayjs().format('YYYY-MM-DD HH:mm:ss'); - - this.getFork(); - this.getTeam(); + this.getStockUpArea(); + // this.getFork(); + // this.getTeam(); }, //确定指派 callFordelivery() { diff --git a/src/views/distribution/reservation/reservationAddFrom.vue b/src/views/distribution/reservation/reservationAddFrom.vue index 4c2b0285..38b19a65 100644 --- a/src/views/distribution/reservation/reservationAddFrom.vue +++ b/src/views/distribution/reservation/reservationAddFrom.vue @@ -1702,7 +1702,7 @@ }, mounted() { this.init(); - + this.onLoad(this.page); this.getDictionary(); }, @@ -2054,6 +2054,7 @@ message: '请输入' + item.orderCode + '正确数量!' }); operation = false; + return; } item.reservationNum = item.reservationNum; inventoryIds.push(item.id); @@ -2095,9 +2096,20 @@ item.packageListInfo = item.parcelListVOS; } }); + console.log("------------------->this.form.inventoryList",this.form.inventoryList); + console.log("------------------->this.form.stockArticleList",this.form.stockArticleList); + + if (JSON.stringify(this.form.inventoryList) === '[]' && JSON.stringify(this.form.stockArticleList) === '[]' ){ + this.$message({ + type: 'warning', + message: '无效的预约计划!' + }); + operation = false; + return; + } // this.form.stockArticleList = this.packageList; console.log('>>>>>>>>', this.form); - if (this.reservationId) { + if (this.reservationId) { this.form.id = this.reservationId; update(this.form).then(() => { this.$router.go(-1); diff --git a/src/views/distribution/signfor/distributionSignforedt.vue b/src/views/distribution/signfor/distributionSignforedt.vue index 8d9dd9f1..dd4501aa 100644 --- a/src/views/distribution/signfor/distributionSignforedt.vue +++ b/src/views/distribution/signfor/distributionSignforedt.vue @@ -1,1757 +1,2304 @@