From 2d336fff1b29885e53c560a697a6bae0a45f4fcf Mon Sep 17 00:00:00 2001 From: zhangsiyu Date: Wed, 19 Jul 2023 09:13:19 +0800 Subject: [PATCH 01/10] 1 --- .../driverArtery/basicdataDriverArtery.vue | 1553 +++++++++-------- .../driverArtery/basicdataDriverArtery2.vue | 3 +- 2 files changed, 781 insertions(+), 775 deletions(-) diff --git a/src/views/basicdata/driverArtery/basicdataDriverArtery.vue b/src/views/basicdata/driverArtery/basicdataDriverArtery.vue index 7086e9e4..5a5d2e20 100644 --- a/src/views/basicdata/driverArtery/basicdataDriverArtery.vue +++ b/src/views/basicdata/driverArtery/basicdataDriverArtery.vue @@ -1,814 +1,821 @@ - diff --git a/src/views/basicdata/driverArtery/basicdataDriverArtery2.vue b/src/views/basicdata/driverArtery/basicdataDriverArtery2.vue index 7a4b655a..3e637a4a 100644 --- a/src/views/basicdata/driverArtery/basicdataDriverArtery2.vue +++ b/src/views/basicdata/driverArtery/basicdataDriverArtery2.vue @@ -276,8 +276,7 @@ - - + From ee582b870f1382e394f43a745fcff62a8f9c907d Mon Sep 17 00:00:00 2001 From: kilo Date: Mon, 24 Jul 2023 09:37:21 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E5=95=86=E9=85=8D=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=8C=89=E9=92=AE=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/distributionDeliveryList.js | 17 +++++ src/router/views/index.js | 19 ++++++ .../deliverylist/distributionDeliveryList.vue | 15 +++-- .../distributionDeliveryListedt.vue | 1 + .../reservation/reservationFrom.vue | 1 - .../turndelivery/deliveryDiscuss.vue | 64 +++++++++++++++++++ .../turndelivery/deliveryInfo.vue | 48 +++++++++----- 7 files changed, 143 insertions(+), 22 deletions(-) diff --git a/src/api/distribution/distributionDeliveryList.js b/src/api/distribution/distributionDeliveryList.js index 11a0696d..e06cea50 100644 --- a/src/api/distribution/distributionDeliveryList.js +++ b/src/api/distribution/distributionDeliveryList.js @@ -122,3 +122,20 @@ export const update = (row) => { }) } +/** + * 查询配送任务信息 + * @param id + * @returns {AxiosPromise} + */ +export const getDeliveryList = (id) => { + return request({ + url: '/api/logpm-distribution/deliveryList/getDeliveryList', + method: 'get', + params: { + id, + } + }) +} + + + diff --git a/src/router/views/index.js b/src/router/views/index.js index b35ad518..b92e6455 100644 --- a/src/router/views/index.js +++ b/src/router/views/index.js @@ -548,6 +548,25 @@ export default [ }, ], }, + { + path: '/distribution/turndelivery/deliveryDiscuss', + component: Layout, + redirect: '/distribution/turndelivery/deliveryDiscuss', + children: [ + { + path: '/distribution/turndelivery/deliveryDiscuss', + name: '配送查看', + meta: { + i18n: 'dict', + }, + props: route => ({ + name: route.query.name, + id: route.query.id + }), + component: () => import('@/views/turndelivery/deliverylist/deliveryDiscuss.vue'), + }, + ], + }, { path: '/basicdata/brand/basicdataTripartiteMall', component: Layout, diff --git a/src/views/distribution/deliverylist/distributionDeliveryList.vue b/src/views/distribution/deliverylist/distributionDeliveryList.vue index 1dff85cb..a35aec13 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryList.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryList.vue @@ -51,6 +51,7 @@ > @@ -104,7 +105,6 @@ v-model="dialogVisible" title="增值服务" width="30%" - :model="addvalue" :before-close="handleClose"> @@ -710,11 +710,14 @@ export default { this.form = {} this.box = true }, - handleEdit (row) { - this.title = '编辑' - this.box = true - getDetail(row.id).then(res => { - this.form = res.data.data; + handleEdit (scope) { + const { row} = scope; + this.$router.push({ + path: '/distribution/turndelivery/deliveryDiscuss', + query: { + id: row.id, + name: row.trainNumber +'-编辑配送' + } }); }, handleView (row) { diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue index 699018e0..65200fac 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue @@ -96,6 +96,7 @@ diff --git a/src/views/distribution/reservation/reservationFrom.vue b/src/views/distribution/reservation/reservationFrom.vue index 3206f9a4..59873001 100644 --- a/src/views/distribution/reservation/reservationFrom.vue +++ b/src/views/distribution/reservation/reservationFrom.vue @@ -1030,7 +1030,6 @@ this.form.deliveryPhone = phone; this.form.deliveryType = typeService; this.form.deliveryAddress = address; - this.orderData = data; }); } diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue index 29403422..49267b74 100644 --- a/src/views/distribution/turndelivery/deliveryDiscuss.vue +++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue @@ -691,6 +691,7 @@ import { getDriverList } from '@/api/basicdata/basicdataDriverArtery'; import { selectStockArticleList } from '@/api/distribution/distributionStockArticle'; import { getInventoryList } from '@/api/distribution/distributionStockList'; + import { getDeliveryList } from '@/api/distribution/distributionDeliveryList'; export default { data() { @@ -786,11 +787,22 @@ serveType:[], //外协数据来源 tripartiteSourceData:[], + deliveryListId:'', }; }, created() { + this.$watch( + () => this.$route.params, + () => { + this.fetchData(); + }, + // 组件创建完后获取数据， + // 此时 data 已经被 observed 了 + { immediate: true } + ); + this.getDictionary(); this.getFork(); this.getTeam(); @@ -892,6 +904,13 @@ console.log(res.data.data); }); }, + fetchData() { + this.error = this.post = null; + this.loading = true; + if (this.$route.query.id) { + this.deliveryListId = this.$route.query.id; + } + }, viewDriverInfo() { console.log(this.driverInfo.length); console.log(this.vehticleInfo.length); @@ -1273,7 +1292,52 @@ // this.$refs.table.clearSelection(); }, onLoad(page, params = {}) { + console.log("》》》》》》》》》》》》》》》",this.deliveryListId); + if (this.deliveryListId){ + getDeliveryList(this.deliveryListId).then(res=>{ + let data = res.data.data; + + Object.assign(this.form,data.reservationInfo) + Object.assign(this.form,data.stockupInfo) + this.form.deliveryType = '2'; + this.serveType = data.reservationInfo.serveType.split(","); + if (data.stockupInfo){ + this.loadAndUnload = data.stockupInfo.teamResponsibility.split(","); + } + this.form.loader = data.stockupInfo.loaderName; + this.form.forklift = data.stockupInfo.forkliftName; + this.form.remarks = data.stockupInfo.remarks; + + if (data.kind === "1"){ + //自主配送 + let self = data.deliverySelfVO; + let vehicle = this.vehicleData; + console.log("___________________vahicle",vahicle); + + vehicle.forEach(item=>{ + console.log("___________________",item); + self.forEach(s=>{ + }) + }) + }else { + this.aaa = false; + this.bbb = true; + //外协配送 + } + this.vehicleData.forEach(item=>{ + + }) + + + + + console.log(">>>>>>>>this.form",this.form); + console.log(res.data.data); + this.orderData = data.stockArticleList; + }) + } + this.loading = false; } } diff --git a/src/views/distribution/turndelivery/deliveryInfo.vue b/src/views/distribution/turndelivery/deliveryInfo.vue index cda54be4..9eeb72ef 100644 --- a/src/views/distribution/turndelivery/deliveryInfo.vue +++ b/src/views/distribution/turndelivery/deliveryInfo.vue @@ -476,6 +476,7 @@ { immediate: true } ); + this.getDictionary(); this.getFork(); this.getTeam(); @@ -756,6 +757,8 @@ const params = this.form; let stockup = {}; let tripartite = {}; + let data = {}; + let allocationInfo = []; //备货区数据构建 if (params.loader) { @@ -765,26 +768,41 @@ stockup.loaderId = a.dictKey; } }); + data.stockup = stockup; + } + if (params.forklift){ + this.forkliftData.forEach(b => { + if (params.forklift === b.dictKey) { + stockup.forkliftName = b.dictValue; + stockup.forkliftId = b.dictKey; + } + }); + data.stockup = stockup; + } + + if (params.goodsAreaId){ + + this.goodsAreaData.forEach(c => { + if (params.goodsAreaId === c.dictKey) { + stockup.goodsAreaId = c.dictKey; + stockup.goodsAreaName = c.dictValue; + } + + }); + data.stockup = stockup; } - this.forkliftData.forEach(b => { - if (params.forklift === b.dictKey) { - stockup.forkliftName = b.dictValue; - stockup.forkliftId = b.dictKey; - } - }); - this.goodsAreaData.forEach(c => { - if (params.goodsAreaId === c.dictKey) { - stockup.goodsAreaId = c.dictKey; - stockup.goodsAreaName = c.dictValue; - } - }); if (params.stockupDate) { stockup.stockupDate = params.stockupDate; + data.stockup = stockup; } if (params.remarks) { stockup.remarks = params.remarks; + data.stockup = stockup; + } + if (this.loadAndUnload.length>0){ + stockup.loadAndUnload = this.loadAndUnload.join(','); + data.stockup = stockup; } - stockup.loadAndUnload = this.loadAndUnload.join(','); //判断是否是三方配送 if (params.tripartiteSource) { //三方配送数据构建 @@ -831,8 +849,8 @@ allocationInfo = info; } } - let data = {}; - data.stockup = stockup; + + // data.stockup = stockup; data.masterDriverName = this.form.masterDriverName; data.masterVehicleNub = this.form.masterVehicleNub; data.allocationInfo = allocationInfo; From be1932929cf12e3e061d49c663381af50cea1dfa Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Mon, 24 Jul 2023 09:45:19 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=87=E8=B4=A7?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stockup/distributionStockupDetails.vue | 63 ++++++++++++++----- 1 file changed, 46 insertions(+), 17 deletions(-) diff --git a/src/views/distribution/stockup/distributionStockupDetails.vue b/src/views/distribution/stockup/distributionStockupDetails.vue index 11362176..de909e16 100644 --- a/src/views/distribution/stockup/distributionStockupDetails.vue +++ b/src/views/distribution/stockup/distributionStockupDetails.vue @@ -595,12 +595,41 @@ export default { // this.$refs.table.clearSelection(); }, currentChange (currentPage) { - this.page.currentPage = currentPage; - this.onLoad(this.page); + if(!!this.leibiao && this.leibiao == 'library'){ + this.page.currentPage = currentPage; + this.getOrderList(this.page); + + }else if(!!this.leibiao && this.leibiao == 'outbound'){ + this.page1.currentPage = currentPage; + this.getStockUpParcelsList(this.page1); + } + else if(!!this.leibiao && this.leibiao == 'enter'){ + this.page2.currentPage = currentPage; + this.getInventoryList(this.page2); + } + else { + this.page3.currentPage = currentPage; + this.getReservationList(this.page3); + } }, sizeChange (pageSize) { - this.page.pageSize = pageSize; - this.onLoad(this.page); + if(!!this.leibiao && this.leibiao == 'library'){ + this.page.pageSize = pageSize; + this.getOrderList(this.page); + + }else if(!!this.leibiao && this.leibiao == 'outbound'){ + this.page1.pageSize = pageSize; + this.getStockUpParcelsList(this.page1); + } + else if(!!this.leibiao && this.leibiao == 'enter'){ + this.page2.pageSize = pageSize; + this.getInventoryList(this.page2); + } + else{ + this.page3.pageSize = pageSize; + this.getReservationList(this.page3); + } + }, onLoad (page, params = {}) { this.loading = true; @@ -622,14 +651,14 @@ export default { deliveryTypeName }); this.loading = false; - this.getReservationList(); + this.getReservationList(page); // console.log(">>>>>",this.data[0],deliveryTypeName,deliveryWayName,serveTypeName); this.selectionClear(); }); } , //查询预约列表 - async getReservationList(){ - let a =await getDetailReservationOwn(this.page3.currentPage,this.page3.pageSize,{id :this.$route.query.id}); + async getReservationList(page){ + let a =await getDetailReservationOwn(page.currentPage,page.pageSize,{id :this.$route.query.id}); // console.log("......",a.data); const data = a.data.data; this.data3 = data.records; @@ -644,8 +673,8 @@ export default { this.selectionClear(); }, //查询包件列表 - async getStockUpParcelsList(){ - let a = await getParcelListOwn(this.page1.currentPage,this.page1.pageSize,{id :this.$route.query.id}); + async getStockUpParcelsList(page){ + let a = await getParcelListOwn(page.currentPage,page.pageSize,{id :this.$route.query.id}); console.log("包件...",a.data); const data = a.data.data; this.data1 = data.records; @@ -660,8 +689,8 @@ export default { this.selectionClear(); }, //查询订单列表 - async getOrderList(){ - let a =await getDetailOrderOwn(this.page.currentPage,this.page.pageSize,{id :this.$route.query.id}); + async getOrderList(page){ + let a =await getDetailOrderOwn(page.currentPage,page.pageSize,{id :this.$route.query.id}); console.log("订单...",a.data); const data = a.data.data; this.dataPare = data.records; @@ -676,18 +705,18 @@ export default { this.selectionClear(); }, //查询库存品列表 - async getInventoryList(){ - let a =await getDetailInventoryOwn(this.page.currentPage,this.page.pageSize,{id :this.$route.query.id}); - console.log("订单...",a.data); + async getInventoryList(page){ + let a =await getDetailInventoryOwn(page.currentPage,page.pageSize,{id :this.$route.query.id}); + console.log("库存品...",a.data); const data = a.data.data; - this.dataPare = data.records; - this.dataPare.forEach(i =>{ + this.data2 = data.records; + this.data2.forEach(i =>{ let b = this.stockupStatusList.find( a => a.dictKey == i.stockupStatus); if(!!b){ i.stockupStatusName = b.dictValue; } }) - this.page.total = a.data.data.total; + this.page2.total = a.data.data.total; this.loading = false; this.selectionClear(); }, From 0aafc2e1d436b93ce75f4f19ff015fcb976141c0 Mon Sep 17 00:00:00 2001 From: zhangsiyu Date: Mon, 24 Jul 2023 10:10:04 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 917d0d8a..543bad65 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ .DS_Store node_modules /dist -vite.config.js /tests/e2e/videos/ /tests/e2e/screenshots/ @@ -16,6 +15,7 @@ yarn-error.log* # lock files package-lock.json +vite.config.js yarn.lock # editor directories and files From 24651bb15eef5001da725dd69f423dfdbaf485d2 Mon Sep 17 00:00:00 2001 From: zhangsiyu Date: Mon, 24 Jul 2023 10:11:19 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E6=9A=82=E5=AD=98=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 ++- vite.config.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 543bad65..1772b859 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ node_modules /dist /tests/e2e/videos/ /tests/e2e/screenshots/ +vite.config.js # local env files .env.local @@ -15,7 +16,7 @@ yarn-error.log* # lock files package-lock.json -vite.config.js + yarn.lock # editor directories and files diff --git a/vite.config.js b/vite.config.js index a4671845..b93c008b 100644 --- a/vite.config.js +++ b/vite.config.js @@ -12,7 +12,7 @@ export default ({ mode, command }) => { port: 2888, proxy: { '/api': { - target: 'http://192.168.2.97:9999', + target: 'http://192.168.2.11:8889', //target: 'http://test3.javablade.com', changeOrigin: true, rewrite: path => path.replace(/^\/api/, ''), From 7ef4ba3c54d19ba201b44cc09e4b745f59e32d7d Mon Sep 17 00:00:00 2001 From: zhangsiyu Date: Mon, 24 Jul 2023 15:03:14 +0800 Subject: [PATCH 06/10] Squashed commit of the following: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 90291a00b04155608041d88f7b7b8d88b55bb318 Merge: be19329 ee582b8 Author: caoyizhong <1270296080@qq.com> Date: Mon Jul 24 09:45:25 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit be1932929cf12e3e061d49c663381af50cea1dfa Author: caoyizhong <1270296080@qq.com> Date: Mon Jul 24 09:45:19 2023 +0800 修改备货详情分页 commit ee582b870f1382e394f43a745fcff62a8f9c907d Author: kilo Date: Mon Jul 24 09:37:21 2023 +0800 商配订单编辑按钮功能 commit 69e78881de7d88bf71f5eed0e2448ed00e326295 Author: caoyizhong <1270296080@qq.com> Date: Sat Jul 22 18:18:28 2023 +0800 修改备货查询页面 commit 1f88807491dc926b7ba2bceb31b597625d589c82 Author: ‘chaoosc’ <‘chaoosc@gmail.com’> Date: Sat Jul 22 16:38:46 2023 +0800 完成对客户仓库的绑定 commit 5115291ed0f71450c509b26f932d271e3807a64f Author: ‘chaoosc’ <‘chaoosc@gmail.com’> Date: Sat Jul 22 15:48:57 2023 +0800 修改服务仓绑定 commit 2e91cd33f73690aabe1d7ded6f0034df67f4f119 Author: pref_mail@163.com <123456> Date: Sat Jul 22 14:27:45 2023 +0800 增加未客户指定服务仓库 commit 27bad3bf5e511e724290b8713c8419ff45ad3547 Author: caoyizhong <1270296080@qq.com> Date: Sat Jul 22 10:47:18 2023 +0800 修改备货页面 commit 90216258bfe6cac9216b656b9f6650003e445c42 Author: zhenghaoyu Date: Fri Jul 21 08:57:04 2023 +0800 修改客户列表bug commit b47b37d5a5057fa4e7ba691ca71194b7d28f7235 Merge: a36232b 64a011b Author: caoyizhong <1270296080@qq.com> Date: Thu Jul 20 20:35:14 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit a36232b89bec58b13c05dcec0f218b5efbc0783d Author: caoyizhong <1270296080@qq.com> Date: Thu Jul 20 20:35:08 2023 +0800 修改添加备货页面 commit 64a011b966b85a494a1b385d316e8f7c26560cec Author: kilo Date: Thu Jul 20 19:00:42 2023 +0800 托盘、货位增加老系统数据维护 commit d2cec50b73fc4a2254fba1ec32efe6f76137622b Merge: 886221c cd7883d Author: kilo Date: Thu Jul 20 18:59:38 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit cd7883da6994a9b89bfd807deb6ad49e301588f6 Author: 0.0 <1092404103.qq.com> Date: Thu Jul 20 18:15:04 2023 +0800 1.库存品详情 commit 886221c46b13b7a8f291c85842d1c60c44dab0c4 Merge: 8869a82 c3a675b Author: kilo Date: Thu Jul 20 17:33:21 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit c3a675b9f61fc672a2e0bcec4ea2f2ea07a0b15b Author: zhenghaoyu Date: Thu Jul 20 09:55:37 2023 +0800 在库运单功能模块提交 commit 67f50c40e1d93f6521fb2e2ac7ecfaa6047edb53 Author: 0.0 <1092404103.qq.com> Date: Thu Jul 20 08:58:19 2023 +0800 1.文员签收时间 commit 8869a82210e04b460d73b9e5d15c3aa4b73ed8d5 Author: kilo Date: Wed Jul 19 19:00:24 2023 +0800 预约查看页面 commit b51ac6154176b6eb11dfc31400434066fbe7f85d Merge: cdbe2c9 2db4ddc Author: 0.0 <1092404103.qq.com> Date: Wed Jul 19 18:13:32 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit cdbe2c90ad65a6d8356a70140c278fad40adb943 Author: 0.0 <1092404103.qq.com> Date: Wed Jul 19 18:13:28 2023 +0800 1.原型修改 commit 2db4ddcc230b99d1ba1385e3384f08c6fb147062 Author: caoyizhong <1270296080@qq.com> Date: Wed Jul 19 18:09:19 2023 +0800 修改库存品查看页面 commit 95d1eef069ff23f7038a027c2cfdf3b02996ca72 Author: caoyizhong <1270296080@qq.com> Date: Wed Jul 19 11:02:20 2023 +0800 修改库存品页面 # Conflicts: # vite.config.js --- src/api/basicdata/basicdataGoodsArea.js | 18 +- src/api/basicdata/basicdataWarehouse.js | 6 + .../distribution/distributionDeliveryList.js | 46 + .../distribution/distributionParcelList.js | 11 + .../distribution/distributionReservation.js | 48 + src/api/distribution/distributionSignfor.js | 11 + .../distribution/distributionStockArticle.js | 11 + src/api/distribution/distributionStockList.js | 12 + src/api/distribution/distributionStockup.js | 44 + .../distributionUnpackingDetails.js | 12 + src/option/basicdata/basicStorageServices.js | 6 +- .../basicdata/basicdataGoodsAllocation.js | 23 +- src/option/basicdata/basicdataGoodsArea.js | 1 + src/option/basicdata/basicdataGoodsShelf.js | 2 +- src/option/basicdata/basicdataStoreBrand.js | 2 +- src/option/basicdata/basicdataTray.js | 19 + .../distributionReservationDetails.js | 96 + .../distribution/distributionStockList.js | 304 +- .../distribution/distributionStockup.js | 634 +++- src/router/views/index.js | 51 + src/views/basicdata/brand/basicClient.vue | 1 + .../basicdata/brand/basicStorageServices.vue | 71 +- .../basicdata/brand/basicdataStoreBrand.vue | 207 +- .../goodsArea/basicdataGoodsArea.vue | 135 +- .../goodsShelf/basicdataGoodsShelf.vue | 122 +- .../deliverylist/distributionDeliveryList.vue | 15 +- .../distributionDeliveryListdis.vue | 218 +- .../distributionDeliveryListedt.vue | 316 +- .../distributionDeliveryListmar.vue | 200 +- .../distributionStockArticleDiscuss.vue | 2 +- .../inventory/distributionStockList.vue | 456 +-- .../distributionStockListDetails.vue | 334 ++- .../distributionStockListDiscuss.vue | 647 +++-- .../inventory/distributionStockListMarket.vue | 617 ++-- .../inventory/distributionStockListSelf.vue | 617 ++-- .../distribution/reservation/reservation.vue | 153 +- .../reservation/reservationDetails.vue | 1239 ++++++++ .../reservation/reservationFrom.vue | 112 +- .../signfor/distributionSignforedt.vue | 496 +++- .../stockup/distributionStockup.vue | 25 +- .../stockup/distributionStockupDetails.vue | 748 +++++ .../turndelivery/deliveryDiscuss.vue | 2572 +++++++++-------- .../turndelivery/deliveryInfo.vue | 48 +- src/views/warehouse/warehouseWaybill.vue | 48 +- vite.config.js | 2 +- 45 files changed, 8289 insertions(+), 2469 deletions(-) create mode 100644 src/option/distribution/distributionReservationDetails.js create mode 100644 src/views/distribution/reservation/reservationDetails.vue create mode 100644 src/views/distribution/stockup/distributionStockupDetails.vue diff --git a/src/api/basicdata/basicdataGoodsArea.js b/src/api/basicdata/basicdataGoodsArea.js index 90d2d458..a07c1cf3 100644 --- a/src/api/basicdata/basicdataGoodsArea.js +++ b/src/api/basicdata/basicdataGoodsArea.js @@ -93,26 +93,14 @@ export const getWarehouseList = (current, size, params) => { * @param id 仓库ID * @returns {AxiosPromise} */ -export const getGoodsAreaList = (id) => { +export const getGoodsAreaList = () => { return request({ - url: '/api/logpm-basicdata/goodsArea/goodsArealist', + url: '/api/logpm-basicdata/goodsArea/list', method: 'get', - params: { - id, - } }) } -/** - * 仓库信息列表 - * @returns {AxiosPromise} - */ -export const getNodeList = () => { - return request({ - url: '/api/logpm-basicdata/goodsArea/goodsNode', - method: 'get', - }); -}; + diff --git a/src/api/basicdata/basicdataWarehouse.js b/src/api/basicdata/basicdataWarehouse.js index 4f19a450..7490b4de 100644 --- a/src/api/basicdata/basicdataWarehouse.js +++ b/src/api/basicdata/basicdataWarehouse.js @@ -11,6 +11,12 @@ export const getList = (current, size, params) => { } }) } + + + + + + export const getListCopy = (current, size, params) => { return request({ url: '/api/logpm-basicdata/warehouse/list', diff --git a/src/api/distribution/distributionDeliveryList.js b/src/api/distribution/distributionDeliveryList.js index 9117f5ee..e06cea50 100644 --- a/src/api/distribution/distributionDeliveryList.js +++ b/src/api/distribution/distributionDeliveryList.js @@ -43,6 +43,13 @@ export const getDetail = (id) => { } }) } +export const getOneclick = (data) => { + return request({ + url: '/api/logpm-distribution/deliveryList/oneloading', + method: 'post', + data: data + }) +} export const getWrapdetail = (current, size, params) => { return request({ @@ -66,6 +73,28 @@ export const getpackdetail = (current, size, params) => { } }) } +export const getinventorydetail = (current, size, params) => { + return request({ + url: '/api/logpm-distribution/deliveryList/inventory', + method: 'get', + params: { + ...params, + current, + size, + } + }) +} +export const getorddetail = (current, size, params) => { + return request({ + url: '/api/logpm-distribution/deliveryList/order', + method: 'get', + params: { + ...params, + current, + size, + } + }) +} export const remove = (ids) => { return request({ @@ -93,3 +122,20 @@ export const update = (row) => { }) } +/** + * 查询配送任务信息 + * @param id + * @returns {AxiosPromise} + */ +export const getDeliveryList = (id) => { + return request({ + url: '/api/logpm-distribution/deliveryList/getDeliveryList', + method: 'get', + params: { + id, + } + }) +} + + + diff --git a/src/api/distribution/distributionParcelList.js b/src/api/distribution/distributionParcelList.js index beb3f4ca..d788d81e 100644 --- a/src/api/distribution/distributionParcelList.js +++ b/src/api/distribution/distributionParcelList.js @@ -22,6 +22,17 @@ export const getListOwn = (current, size, params) => { } }) } +export const getParcelListOwn = (current, size, params) => { + return request({ + url: '/api/logpm-distribution/distributionParcelList/parcelListOwn', + method: 'get', + params: { + ...params, + current, + size, + } + }) +} export const getDetail = (id) => { return request({ diff --git a/src/api/distribution/distributionReservation.js b/src/api/distribution/distributionReservation.js index 60ae0327..1b3e9093 100644 --- a/src/api/distribution/distributionReservation.js +++ b/src/api/distribution/distributionReservation.js @@ -127,6 +127,54 @@ export const deliveryBusinessTask = (data) => { }) } +/** + * 取消预约 + * @param data + * @returns {AxiosPromise} + */ +export const cancelReservation = (data) => { + return request({ + url: '/api/logpm-distribution/reservation/cancelReservation', + method: 'put', + data:data + }) +} + +export const getReservationDetail = (id) => { + return request({ + url: '/api/logpm-distribution/reservation/getReservationDetail', + method: 'get', + params: { + id + } + }) +} + +export const getReservationPackage = (reservationId,id) => { + return request({ + url: '/api/logpm-distribution/reservation/getReservationPackage', + method: 'get', + params: { + reservationId, + id + } + }) +} + +export const getReservationPackageList = (reservationId,id) => { + return request({ + url: '/api/logpm-distribution/reservation/getReservationPackageList', + method: 'get', + params: { + reservationId, + } + }) +} + + + + + diff --git a/src/api/distribution/distributionSignfor.js b/src/api/distribution/distributionSignfor.js index 65729727..f261ad26 100644 --- a/src/api/distribution/distributionSignfor.js +++ b/src/api/distribution/distributionSignfor.js @@ -22,6 +22,17 @@ export const getPage = (current, size, params) => { } }) } +export const getListOrder = (current, size, params) => { + return request({ + url: '/api/logpm-distribution/reservationStockarticle/orderpage', + method: 'get', + params: { + ...params, + current, + size, + } + }) +} export const getstatistics = (current, size, params) => { return request({ url: '/api/logpm-distribution/signfor/statistics', diff --git a/src/api/distribution/distributionStockArticle.js b/src/api/distribution/distributionStockArticle.js index 8ad9d566..7cd4da5c 100644 --- a/src/api/distribution/distributionStockArticle.js +++ b/src/api/distribution/distributionStockArticle.js @@ -111,3 +111,14 @@ export const selectStockArticleList = (current, size, params) => { }) } +export const getStockAddValue = (id) => { + return request({ + url: '/api/logpm-distribution/distributionAddvalue/getStockAddValue', + method: 'get', + params: { + id, + } + }) +} + + diff --git a/src/api/distribution/distributionStockList.js b/src/api/distribution/distributionStockList.js index 72908638..fa496afc 100644 --- a/src/api/distribution/distributionStockList.js +++ b/src/api/distribution/distributionStockList.js @@ -11,6 +11,18 @@ export const getList = (current, size, params) => { } }) } + +export const getStockListOwn = (current, size, params) => { + return request({ + url: '/api/logpm-distribution/distributionStockList/listOwn', + method: 'get', + params: { + ...params, + current, + size, + } + }) +} export const getListStockList = (current, size, params) => { return request({ url: '/api/logpm-distribution/distributionStockList/list', diff --git a/src/api/distribution/distributionStockup.js b/src/api/distribution/distributionStockup.js index 87788f43..4ecdcfb3 100644 --- a/src/api/distribution/distributionStockup.js +++ b/src/api/distribution/distributionStockup.js @@ -28,6 +28,50 @@ export const getDetail = (id) => { }) } +export const getDetailStockupOwn = (id) => { + return request({ + url: '/api/logpm-distribution/distributionStockup/detailOwn', + method: 'get', + params: { + id + } + }) +} +export const getDetailOrderOwn = (current, size, params) => { + return request({ + url: '/api/logpm-distribution/distributionStockup/detailOrderOwn', + method: 'get', + params: { + ...params, + current, + size, + } + }) +} +export const getDetailInventoryOwn = (current, size, params) => { + return request({ + url: '/api/logpm-distribution/distributionStockup/inventoryOwn', + method: 'get', + params: { + ...params, + current, + size, + } + }) +} + +export const getDetailReservationOwn = (current, size, params) => { + return request({ + url: '/api/logpm-distribution/distributionStockup/detailReservationOwn', + method: 'get', + params: { + ...params, + current, + size, + } + }) +} + export const remove = (ids) => { return request({ url: '/api/logpm-distribution/distributionStockup/remove', diff --git a/src/api/distribution/distributionUnpackingDetails.js b/src/api/distribution/distributionUnpackingDetails.js index f263f2c3..1da1b22a 100644 --- a/src/api/distribution/distributionUnpackingDetails.js +++ b/src/api/distribution/distributionUnpackingDetails.js @@ -12,6 +12,18 @@ export const getList = (current, size, params) => { }) } +export const getListUnpackingDetails = (current, size, params) => { + return request({ + url: '/api/logpm-distribution/distributionUnpackingDetails/list', + method: 'get', + params: { + ...params, + current, + size, + } + }) +} + export const getDetail = (id) => { return request({ url: '/api/logpm-distribution/distributionUnpackingDetails/detail', diff --git a/src/option/basicdata/basicStorageServices.js b/src/option/basicdata/basicStorageServices.js index feca2d12..29aad493 100644 --- a/src/option/basicdata/basicStorageServices.js +++ b/src/option/basicdata/basicStorageServices.js @@ -94,13 +94,13 @@ export default { hide: true, }, { - label: "发货单位", - prop: "linkman", + label: "发站仓库", + prop: "sendWarehouseName", search: true, }, { label: "服务仓库", - prop: "warehouseService", + prop: "serveWarehouseName", search: true, }, ] diff --git a/src/option/basicdata/basicdataGoodsAllocation.js b/src/option/basicdata/basicdataGoodsAllocation.js index 153e5349..29f69410 100644 --- a/src/option/basicdata/basicdataGoodsAllocation.js +++ b/src/option/basicdata/basicdataGoodsAllocation.js @@ -237,7 +237,7 @@ export default { align:'center', }, { - label: "二维码", + label: "货位码", prop: "qrCode", type: "input", align:'center', @@ -247,6 +247,27 @@ export default { editDisplay: false, hide:true, }, + { + label: "旧ID", + prop: "oldId", + type: "input", + align:'center', + labelWidth:'100', + viewDisplay: true, + addDisplay: false, + editDisplay: false, + hide:true, + }, + { + label: "旧货位码", + prop: "oldQrCode", + type: "input", + align:'center', + labelWidth:'100', + viewDisplay: true, + addDisplay: false, + editDisplay: true, + }, { label: "模 板", prop: "templateId", diff --git a/src/option/basicdata/basicdataGoodsArea.js b/src/option/basicdata/basicdataGoodsArea.js index ef9cb46c..91fa6c29 100644 --- a/src/option/basicdata/basicdataGoodsArea.js +++ b/src/option/basicdata/basicdataGoodsArea.js @@ -66,6 +66,7 @@ export default { { label: "货区状态", prop: "enableStatus", + hide:true, }, // { // label: "预留1", diff --git a/src/option/basicdata/basicdataGoodsShelf.js b/src/option/basicdata/basicdataGoodsShelf.js index 8e2e9581..b91b32c4 100644 --- a/src/option/basicdata/basicdataGoodsShelf.js +++ b/src/option/basicdata/basicdataGoodsShelf.js @@ -113,11 +113,11 @@ export default { { label: "货架状态", prop: "goodsShelfStatus", - }, { label: "启用状态", prop: "enableStatus", + hide:true, }, // { // label: "货位名称", diff --git a/src/option/basicdata/basicdataStoreBrand.js b/src/option/basicdata/basicdataStoreBrand.js index 5b5d0b14..8e95a83d 100644 --- a/src/option/basicdata/basicdataStoreBrand.js +++ b/src/option/basicdata/basicdataStoreBrand.js @@ -163,7 +163,7 @@ export default { message: '请选择品牌', trigger: 'blur' } - ] + ], }, { label: "创建时间", diff --git a/src/option/basicdata/basicdataTray.js b/src/option/basicdata/basicdataTray.js index 9f7badbc..f3328d1a 100644 --- a/src/option/basicdata/basicdataTray.js +++ b/src/option/basicdata/basicdataTray.js @@ -194,6 +194,25 @@ export default { viewDisplay: false, hide: true }, + { + label: "旧托盘码", + prop: "oldQrCode", + type: "input", + labelWidth:'100', + addDisplay: false, + editDisplay: true, + viewDisplay: true, + }, + { + label: "旧ID", + prop: "oldId", + type: "input", + labelWidth:'100', + addDisplay: true, + editDisplay: false, + viewDisplay: false, + hide: true + }, // { // label: "二维码", // prop: "qrCode", diff --git a/src/option/distribution/distributionReservationDetails.js b/src/option/distribution/distributionReservationDetails.js new file mode 100644 index 00000000..46442421 --- /dev/null +++ b/src/option/distribution/distributionReservationDetails.js @@ -0,0 +1,96 @@ +export default { + expand: false, + index: true, + border: true, + selection: true, + columnStockArticles: [ + { + label: '预约单编号', + prop: 'id', + hide: true + }, + { + prop: 'orderSelfNumbering', + label: '订单自编号' + }, { + prop: 'waybillNumber', + label: '运单号' + }, + { + label: '货物名称', + prop: 'descriptionGoods' + }, { + label: '物料名称', + prop: 'genre' + },{ + label: '运单号', + prop: 'genre' + },{ + label: '服务类型', + prop: 'genre' + },{ + label: '商场名称', + prop: 'mallName' + },{ + label: '门店名称', + prop: 'storeName' + }, + { + label: '包件数量', + prop: 'reservationNum' + }, + { + label: '增值服务费', + prop: 'fee' + }, + ], + columnParcels: [ + { + label: '主键', + prop: 'id', + display: false, + hide: true + }, + { + label: '仓库', + prop: 'warehouse' + }, + { + label: '包条码', + prop: 'packetBarCode' + }, + { + label: '货位信息', + prop: 'goodsAllocation' + }, + { + label: '所在托盘', + prop: 'pallet' + }, + { + label: '一级品', + prop: 'firsts' + }, + { + label: '二级品', + prop: 'second' + }, + { + label: '三级品', + prop: 'thirdProduct' + }, + { + label: '物料名称', + prop: 'materialName' + }, + { + label: '数量', + prop: 'quantity' + }, + { + label: '车次号', + prop: 'trainNumber' + } + ], + +}; diff --git a/src/option/distribution/distributionStockList.js b/src/option/distribution/distributionStockList.js index 98ec7eb3..0d5d3b54 100644 --- a/src/option/distribution/distributionStockList.js +++ b/src/option/distribution/distributionStockList.js @@ -126,7 +126,7 @@ export default { ], - column: [ + column: [ //库存品 { label: "租户号", prop: "tenantId", @@ -220,30 +220,30 @@ export default { label: "货物名称", prop: "descriptionGoods", }, + { + label: "上架时间", + prop: "warehousingTime", + }, // { - // label: "上架时间", - // prop: "descriptionGoods", - // }, - // { - // label: "包件总数", - // prop: "cargoNumber", - // }, - // { - // label: "在库箱数", - // prop: "warehouse", + // label: "入库数量", + // prop: "quantityStock", // }, { - label: "拆包", - prop: "market", + label: "在库数", + prop: "quantityStock", + }, + { + label: "单位", + prop: "cargoUnit", }, { label: "拆包数", - prop: "quantityStock", + prop: "unpackingQuantity", }, ], - columnDetails: [ + columnDetails: [ //出库明细 { label: "租户号", prop: "tenantId", @@ -330,44 +330,278 @@ export default { }, { label: "预约单号", - prop: "orderSelfNumbering", + prop: "reservationCode", search: true, }, - // { - // label: "入库批次号", - // prop: "incomingBatch", - // }, { - label: "所属订单", - prop: "descriptionGoods", + label: "出库类型", + prop: "outboundType", }, { - label: "配送单", - prop: "cargoNumber", + label: "订单自编号", + prop: "orderSelfNumbering", + }, + { + label: "配送单号", + prop: "deliveryListCode", }, { label: "创建时间 ", - prop: "warehouse", + prop: "createTime", }, - // { - // label: "商场", - // prop: "market", - // }, { - label: "预约数量", - prop: "cargoUnit", + label: "单位", + prop: "unit", }, // { + // label: "预约数量", + // prop: "appointmentQuantity", + // }, + // { // label: "门店", // prop: "shop", // }, + { + label: "库位信息", + prop: "goodsAllocation", + }, // { - // label: "库位信息", - // prop: "storageLocation", + // label: "实发数量", + // prop: "issuedQuantity", + // search: true, // }, + + ], + columnWarehousing: [ //入库明细 + { + 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: "id", + display: false, + hide: true, + }, + { + label: "预留1", + prop: "reserve1", + display: false, + hide: true, + }, + { + label: "预留2", + prop: "reserve2", + display: false, + hide: true, + }, + { + label: "预留3", + prop: "reserve3", + display: false, + hide: true, + }, + { + label: "预留4", + prop: "reserve4", + display: false, + hide: true, + }, + { + label: "预留5", + prop: "reserve5", + display: false, + hide: true, + }, + { + label: "入库批次", + prop: "incomingBatch", + search: true, + }, + { + label: "入库时间", + prop: "warehousingTime", + }, + { + label: "订单自编号", + prop: "orderSelfNumbering", + }, + { + label: "运单编号", + prop: "cargoNumber", + }, + { + label: "物流车次 ", + prop: "despatch", + }, + { + label: "车牌", + prop: "licensePlate", + }, + { + label: "入库数量", + prop: "quantityStock", + search: true, + }, + + ], + columnUnpacking: [ //拆明细 + { + 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: "mallName", + label: "创建部门", + prop: "createDept", + display: false, + hide: true, + }, + { + label: "主键", + prop: "id", + display: false, + hide: true, + }, + { + label: "预留1", + prop: "reserve1", + display: false, + hide: true, + }, + { + label: "预留2", + prop: "reserve2", + display: false, + hide: true, + }, + { + label: "预留3", + prop: "reserve3", + display: false, + hide: true, + }, + { + label: "预留4", + prop: "reserve4", + display: false, + hide: true, + }, + { + label: "预留5", + prop: "reserve5", + display: false, + hide: true, + }, + { + label: "入库批次", + prop: "incomingBatch", + search: true, + }, + { + label: "入库时间", + prop: "warehousingTime", + }, + { + label: "订单自编号", + prop: "orderSelfNumbering", + }, + { + label: "运单编号", + prop: "cargoNumber", + }, + { + label: "物流车次 ", + prop: "despatch", + }, + { + label: "车牌", + prop: "licensePlate", + }, + { + label: "入库数量", + prop: "quantityStock", search: true, }, diff --git a/src/option/distribution/distributionStockup.js b/src/option/distribution/distributionStockup.js index 67bfe820..476f5c59 100644 --- a/src/option/distribution/distributionStockup.js +++ b/src/option/distribution/distributionStockup.js @@ -3,7 +3,7 @@ export default { index: true, border: true, selection: true, - column: [ + columnReservation: [ // 备货订单 { label: "主键", prop: "id", @@ -58,19 +58,497 @@ export default { 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, + },*/ + + ], + columnStockOrder: [ // 备货订单 + { + 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: "orderSelfNumbering", + }, + { + label: "货物名称", + prop: "descriptionGoods", + search: true, + }, +/* { + label: "物料名称", + prop: "stockupArea", + search: true, + },*/ + { + label: "备货件数", + prop: "reservationNum", + search: true, + }, + { + label: "已备数量", + prop: "number", + }, + { + label: "备货状态", + prop: "stockupStatusName", + display: false, + }, { label: "备货时间", prop: "stockupDate", - format: "YYYY-MM-DD hh:mm:ss", - valueFormat: "YYYY-MM-DD hh:mm:ss", + display: false, }, + // { + // label: "托盘码", + // prop: "reserve3", + // display: false, + // }, { - label: "备货人", - prop: "stockupUser", + label: "库位信息", + prop: "goodsAllocation", + display: false, + }, + { + label: "备货区", + prop: "stockupArea", + display: false, + }, + + ], + columnStockingBag: [ //备货包件 + { + 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: "packetBarCode", + }, + { + label: "一级品", + prop: "firsts", + search: true, + }, + { + label: "二级品", + prop: "second", + search: true, + }, + { + label: "三级品", + prop: "thirdProduct", + search: true, + }, + { + label: "物料名称", + prop: "materialName", }, { label: "备货状态", - prop: "stockupStatus", + prop: "stockupStatusName", + display: false, + }, + { + label: "备货时间", + prop: "stockupDate", + display: false, + }, + { + label: "托盘码", + prop: "pallet", + display: false, + }, + { + label: "库位信息", + prop: "goodsAllocation", + display: false, + }, + { + label: "备货区", + prop: "stockupArea", + display: false, + }, + ], + columnInventory: [ //库存品 + { + 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: "SKU", + prop: "sku", + }, + { + label: "订单编号", + prop: "orderSelfNumbering", + search: true, + }, + { + label: "物料名称", + prop: "descriptionGoods", + search: true, + }, + { + label: "单位", + prop: "cargoUnit", + search: true, + }, + { + label: "备货数", + prop: "reservationNum", + }, + { + label: "已备数量", + prop: "number", + display: false, + }, + { + label: "备货状态", + prop: "stockupStatusName", + display: false, + }, + { + label: "备货时间", + prop: "stockupDate", + display: false, + }, + { + label: "托盘码", + prop: "pallet", + display: false, + }, + { + label: "库位信息", + prop: "goodsAllocation", + display: false, + }, + { + label: "备货区", + prop: "stockupArea", + }, + ], + columnBasic: [ //基本信息 + { + 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: "stockupCode", + }, + // { + // label: "商场名称", + // prop: "stockupStatus", + // search: true, + // }, + { + label: "备货时间", + prop: "reservationDate", + search: true, + }, + { + label: "预约服务类型", + prop: "serveTypeName", + search: true, + }, + { + label: "配送方式", + prop: "deliveryWayName", + }, + { + label: "配送类型", + prop: "deliveryTypeName", + }, + { + label: "配送车次", + prop: "trainNumber", search: true, }, { @@ -78,68 +556,158 @@ export default { prop: "stockupArea", search: true, }, + ], + /*columnTakeOver: [ //收货人信息 + { + label: "主键", + prop: "id", + display: false, + hide: true, + }, + { + label: "租户号", + prop: "tenantId", + display: false, + hide: true, + }, { - label: "指派状态", - prop: "assignStatus", + 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: "stockupStatus", search: true, }, { - label: "备货库位", - prop: "stockipAllocation", + label: "收货地址", + prop: "stockupArea", + search: true, }, + + ], + columnStockUp: [ //备货信息 { - label: "预留1", - prop: "reserve1", + label: "主键", + prop: "id", display: false, hide: true, }, { - label: "预留2", - prop: "reserve2", + label: "租户号", + prop: "tenantId", display: false, hide: true, }, { - label: "预留3", - prop: "reserve3", + label: "创建人", + prop: "createUser", display: false, hide: true, }, { - label: "预留4", - prop: "reserve4", + label: "创建时间", + prop: "createTime", display: false, hide: true, }, { - label: "预留5", - prop: "reserve5", + label: "更新人", + prop: "updateUser", + display: false, + hide: true, + }, + { + label: "更新时间", + prop: "updateTime", display: false, hide: true, }, { - label: "备货区编号", - prop: "goodsAreaId", + label: "状态", + prop: "status", + display: false, + hide: true, }, { - label: "叉车司机", - prop: "forklift", + label: "是否已删除", + prop: "isDeleted", + display: false, + hide: true, }, { - label: "装卸班组", - prop: "loader", + label: "创建部门", + prop: "createDept", + display: false, + hide: true, }, { - label: "确认完成备货时间", - prop: "fixTime", + label: "备货时间", + prop: "stockupDate", format: "YYYY-MM-DD hh:mm:ss", valueFormat: "YYYY-MM-DD hh:mm:ss", }, { - label: "指派时间", - prop: "assignTime", - format: "YYYY-MM-DD hh:mm:ss", - valueFormat: "YYYY-MM-DD hh:mm:ss", + label: "备货人", + prop: "stockupUser", + }, + { + label: "备货状态", + prop: "stockupStatus", + search: true, + }, + { + label: "备货区", + prop: "stockupArea", + search: true, }, - ] + ],*/ } diff --git a/src/router/views/index.js b/src/router/views/index.js index e2ee7b13..b92e6455 100644 --- a/src/router/views/index.js +++ b/src/router/views/index.js @@ -423,6 +423,19 @@ export default [ }, ], }, + { + path: '/distribution/reservation/reservationDetails', + component: Layout, + redirect: '/distribution/reservation/reservationDetails', + children: [ + { + path: '/distribution/reservation/reservationDetails', + name: '预约单详情', + id:'id', + component: () => import('@/views/distribution/reservation/reservationDetails.vue'), + }, + ], + }, // { // path: '/distribution/deliverylist/distributionDeliveryList', // component: Layout, @@ -535,6 +548,25 @@ export default [ }, ], }, + { + path: '/distribution/turndelivery/deliveryDiscuss', + component: Layout, + redirect: '/distribution/turndelivery/deliveryDiscuss', + children: [ + { + path: '/distribution/turndelivery/deliveryDiscuss', + name: '配送查看', + meta: { + i18n: 'dict', + }, + props: route => ({ + name: route.query.name, + id: route.query.id + }), + component: () => import('@/views/turndelivery/deliverylist/deliveryDiscuss.vue'), + }, + ], + }, { path: '/basicdata/brand/basicdataTripartiteMall', component: Layout, @@ -649,6 +681,25 @@ export default [ }, ], }, + { + path: '/distribution/stockup/distributionStockupDetails', + component: Layout, + redirect: '/stockup/distributionStockupDetails', + children: [ + { + path: '/distribution/stockup/distributionStockupDetails', + name: '备货明细', + meta: { + i18n: 'dict', + }, + props: route => ({ + name: route.query.name, + id: route.query.id + }), + component: () => import('@/views/distribution/stockup/distributionStockupDetails.vue'), + }, + ], + }, // { // path: '/distribution/inventory/distributionPrints', // component: Layout, diff --git a/src/views/basicdata/brand/basicClient.vue b/src/views/basicdata/brand/basicClient.vue index fd9451ee..0c3b69f6 100644 --- a/src/views/basicdata/brand/basicClient.vue +++ b/src/views/basicdata/brand/basicClient.vue @@ -1060,6 +1060,7 @@ export default { let arrsheng = this.optioner.filter((i) => { return it.bladeRegionProvinceId == i.value; }); + if(arrsheng.length == 0) return // console.log("========",JSON.parse(JSON.stringify(arrsheng)) ); let arrshi = arrsheng[0].children.filter((i) => { return it.bladeRegionCityId == i.value; diff --git a/src/views/basicdata/brand/basicStorageServices.vue b/src/views/basicdata/brand/basicStorageServices.vue index 467ae269..013d0e23 100644 --- a/src/views/basicdata/brand/basicStorageServices.vue +++ b/src/views/basicdata/brand/basicStorageServices.vue @@ -7,11 +7,11 @@ - - + + - + @@ -109,29 +109,53 @@ - + - + + - - + + + + + + + + + + + + + + + diff --git a/src/views/distribution/inventory/distributionStockListDetails.vue b/src/views/distribution/inventory/distributionStockListDetails.vue index 9182d541..0b462158 100644 --- a/src/views/distribution/inventory/distributionStockListDetails.vue +++ b/src/views/distribution/inventory/distributionStockListDetails.vue @@ -3,72 +3,59 @@
- - - - - - - - - - - - - - + - + {{queryOwn.descriptionGoods}} - + {{queryOwn.cargoNumber}} - - + + {{queryOwn.warehouseName}} - - + + {{queryOwn.marketName}} - + {{queryOwn.unit}} - + {{queryOwn.storeName}} - + - - - - - + + + + + + --> @@ -86,14 +73,14 @@ v-model="activeName" @tab-click="handleClick" > - + - + @@ -106,24 +93,29 @@ :key="index"> - - - - +
+ + + +
+ - + - @@ -136,25 +128,96 @@ :key="index"> - - - + +
+ + + +
+ + + + + + + +
+ + + +
- + - - - - + + <!– 分页模块 –>
- + --> @@ -176,12 +239,13 @@ import { getList, getDetail, add, update, remove } from "@/api/distribution/distributionStockList"; import option from "@/option/distribution/distributionStockList"; import { mapGetters } from "vuex"; +import { getListStock } from '@/api/distribution/distributionStock'; export default { data () { return { height: 0, - activeName: 'first', + activeName: 'library', // 弹框标题 title: '', // 是否展示弹框 @@ -194,12 +258,31 @@ export default { view: false, // 查询信息 query: {}, + queryOwn: {}, // 分页信息 page: { currentPage: 1, pageSize: 10, total: 40 }, + // 分页信息 + page1: { + currentPage: 1, + pageSize: 10, + total: 40 + }, + // 分页信息 + page2: { + currentPage: 1, + pageSize: 10, + total: 40 + }, + // 分页信息 + page3: { + currentPage: 1, + pageSize: 10, + total: 40 + }, // 表单数据 form: {}, // 选择行 @@ -208,6 +291,10 @@ export default { option: option, // 表单列表 data: [], + data1: [], + data2: [], + data3: [], + leibiao: '', } }, mounted () { @@ -227,9 +314,20 @@ export default { methods: { handleClick (tab, event) { console.log(tab, event) + console.log(tab.props.name); + this.leibiao = tab.props.name; + if( this.leibiao == 'outbound'){ + this.getOnChu(this.page1); + }else if( this.leibiao == 'enter'){ + //入库 + this.getOnRu(this.page2); + }else if( this.leibiao == 'unpacking'){ + //入库 + this.getOnChai(this.page2); + } }, init () { - this.height = this.setPx(document.body.clientHeight - 340); + this.height = this.setPx(document.body.clientHeight - 470); }, searchHide () { this.search = !this.search; @@ -335,24 +433,114 @@ export default { this.$refs.table.clearSelection(); }, currentChange (currentPage) { - this.page.currentPage = currentPage; - this.onLoad(this.page); + if(!!this.leibiao && this.leibiao == 'outbound'){ + this.page1.currentPage = currentPage; + this.getOnChu(this.page1); + }else if(!!this.leibiao && this.leibiao == 'enter'){ + //入库 + this.page2.currentPage = currentPage; + this.getOnRu(this.page2); + }else if(!!this.leibiao && this.leibiao == 'unpacking'){ + //拆 + this.page3.currentPage = currentPage; + this.getOnRu(this.page3); + }else{ + //库位 + this.page.currentPage = currentPage; + this.onLoad(this.page); + } + }, sizeChange (pageSize) { - this.page.pageSize = pageSize; - this.onLoad(this.page); + if(!!this.leibiao && this.leibiao == 'outbound'){ + this.page1.pageSize = pageSize; + this.getOnChu(this.page1); + }else if(!!this.leibiao && this.leibiao == 'enter'){ + this.page2.pageSize = pageSize; + this.getOnRu(this.page2); + }else if(!!this.leibiao && this.leibiao == 'unpacking'){ + this.page3.pageSize = pageSize; + this.getOnChai(this.page3); + }else{ + this.page.pageSize = pageSize; + this.onLoad(this.page); + } + }, + //查询拆记录 + async getOnChai(page, params = {}){ + this.query={}; + this.query.marketId = this.queryOwn.marketId; + this.query.serviceType = this.queryOwn.serviceType; + this.query.materialId = this.queryOwn.materialId; + this.query.warehouseId = this.queryOwn.warehouseId; + this.query.storeId = !!this.queryOwn.storeId ? this.queryOwn.storeId : null; + let b =await getList(page.currentPage, page.pageSize, Object.assign(params, this.query)); + this.data1 = b.data.data.records; + this.page1.total = b.data.data.total; + this.loading = false; }, - onLoad (page, params = {}) { + //查询出记录 + async getOnChu(page, params = {}){ + this.query={}; + this.query.stockListId = this.$route.query.id; + let b =await getListStock(page.currentPage, page.pageSize, Object.assign(params, this.query)); + this.data1 = b.data.data.records; + this.page1.total = b.data.data.total; + this.loading = false; + }, + //查询入记录 + async getOnRu(page, params = {}){ + this.query={}; + this.query.marketId = this.queryOwn.marketId; + this.query.serviceType = this.queryOwn.serviceType; + this.query.materialId = this.queryOwn.materialId; + this.query.warehouseId = this.queryOwn.warehouseId; + this.query.storeId = !!this.queryOwn.storeId ? this.queryOwn.storeId : null; + if(this.queryOwn.pid != '-1' ){ + this.query.pid = this.queryOwn.pid + } + let b =await getList(page.currentPage, page.pageSize, Object.assign(params, this.query)); + this.data2 = b.data.data.records; + this.page2.total = b.data.data.total; + this.loading = false; + }, + //查询库位记录 + async getOnKu(page, params){ + this.query={}; + this.query.marketId = this.queryOwn.marketId; + this.query.serviceType = this.queryOwn.serviceType; + this.query.materialId = this.queryOwn.materialId; + this.query.warehouseId = this.queryOwn.warehouseId; + this.query.storeId = !!this.queryOwn.storeId ? this.queryOwn.storeId : null; + let b =await getList(page.currentPage, page.pageSize, Object.assign(params, this.query)); + this.data = b.data.data.records; + this.page.total = b.data.data.total; + this.loading = false; + }, + async onLoad (page, params = {}) { this.loading = true; - // this.query. - getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { - const data = res.data.data; - this.page.total = data.total; - this.data = data.records; - this.loading = false; - this.selectionClear(); - }); - } + this.query.id = 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; + // this.data = data.records; + // this.loading = false; + // this.selectionClear(); + // }); + let a =await getList(page.currentPage, page.pageSize, Object.assign(params, this.query)); + console.log("aaaa",a.data.data.records); + this.queryOwn = a.data.data.records[0]; + if(this.queryOwn.pid == '-1' ){ + //查全部 + await this.getOnKu(page, params = {}); + }else{ + //查对应的数据 + await this.getOnKu(page, params = { pid: this.queryOwn.pid }); + } + + + }, + } }; diff --git a/src/views/distribution/inventory/distributionStockListDiscuss.vue b/src/views/distribution/inventory/distributionStockListDiscuss.vue index e25632f5..5767ce61 100644 --- a/src/views/distribution/inventory/distributionStockListDiscuss.vue +++ b/src/views/distribution/inventory/distributionStockListDiscuss.vue @@ -1,28 +1,30 @@ + + + +
@@ -453,7 +460,33 @@ export default { // name: 'food2.jpeg', // url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100', // }, - ] + ], + rules: { + pickUpTime: [ + { type: 'date', required: true, message: '请选择提货时间', trigger: 'change' } + ], + consignee: [ + { required: true, message: '请输入提货人', trigger: 'blur' }, + // { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' } + ], + pickUpPlate: [ + { required: true, message: '请输入提货车牌号', trigger: 'change' } + ], + deliveryDocument: [ + { required: true, message: '请输入提货证件码', trigger: 'change' }, + // { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' } + ], + certificateType: [ + { required: true, message: '请选择证件类型', trigger: 'change' } + ], + freightMark: [ + { required: true, message: '请选择费用', trigger: 'change' } + ], + totalCost: [ + { required: true, message: '请输入费用合计', trigger: 'change' } + ], + + }, } }, mounted () { @@ -516,16 +549,23 @@ export default { }, //确定 callFordelivery(inde){ - this.dialogFormVisible = false; + let isa= false; this.selectionListStock.some( i =>{ - // console.log("asdgfasdv",i); + console.log("asdgfasdv",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); if(!a){ this.data.push(i); } }) - + if(!isa){ + this.dialogFormVisible = false; + } }, //数量校验 handleNumberRange(e,row) { @@ -536,8 +576,8 @@ export default { e.target.value = parseInt(e.target.value); //把字符型转成整数型 } if((e.target.value > row.quantityStock )) { - this.$message.error('数量不能大于订单数') - e.target.value = row.quantityStock; + this.$message.error('数量不能大于可用数量') + // e.target.value = row.quantityStock; return } } @@ -556,6 +596,15 @@ export default { textbox(e,index) { console.log("e,index",e,index); this.costList[index+1] = e; + //计算合计费用 + this.costList.forEach( i =>{ + if(!! this.form.totalCost){ + this.form.totalCost = parseInt(this.form.totalCost)+parseInt(i); + }else{ + this.form.totalCost =parseInt(i); + + } + }) }, handleCheckedCitiesChange(value) { console.log(">>>>>>>",value ); @@ -577,7 +626,6 @@ export default { this.height = this.setPx(document.body.clientHeight - 160); //字典 getDictionaryBiz('delivery_cost').then(res => { - this.clientType = res.data.data; }); //字典 getDictionaryBiz('certificate_type').then(res => { @@ -619,66 +667,71 @@ export default { } }, async handleSubmit () { - if (!this.form.id) { - let fei = new Map(); - await this.bianLier(this.costListName,this.clientType,this.costList,fei); - this.form.fei = Object.fromEntries(fei); - this.form.stockArticleId = this.$route.query.id; - this.form.stockDTOList = this.data; - let o = []; - if(this.fileListClerk.length > 0){ - this.fileListClerk.forEach( i =>{ - // console.log("iiii",i); - let num = {}; - num.state = "2"; - num.name = i.response.data.name; - num.url = i.response.data.link; - o.push(num); - }); + this.$refs.form.validate( async valid=>{ + if (valid) { + if (!this.form.id) { + let fei = new Map(); + await this.bianLier(this.costListName,this.clientType,this.costList,fei); + this.form.fei = Object.fromEntries(fei); + this.form.stockArticleId = this.$route.query.id; + this.form.stockDTOList = this.data; + let o = []; + if(this.fileListClerk.length > 0){ + this.fileListClerk.forEach( i =>{ + // console.log("iiii",i); + let num = {}; + num.state = "2"; + num.name = i.response.data.name; + num.url = i.response.data.link; + o.push(num); + }); - }else if(this.fileListLibrary.length > 0){ - this.fileListLibrary.forEach( i =>{ - let num = {}; - num.state = "3"; - num.name = i.response.data.name; - num.url = i.response.data.link; - o.push(num); - }); + }else if(this.fileListLibrary.length > 0){ + this.fileListLibrary.forEach( i =>{ + let num = {}; + num.state = "3"; + num.name = i.response.data.name; + num.url = i.response.data.link; + o.push(num); + }); - }else if(this.fileListSell.length > 0){ - this.fileListSell.forEach( i =>{ - // console.log(",.,.,.,.",i); - let num = {}; - num.state = "1"; - num.name = i.response.data.name; - num.url = i.response.data.link; - o.push(num); - }); - } - this.form.printList = o.length > 0 ? o : []; + }else if(this.fileListSell.length > 0){ + this.fileListSell.forEach( i =>{ + // console.log(",.,.,.,.",i); + let num = {}; + num.state = "1"; + num.name = i.response.data.name; + num.url = i.response.data.link; + o.push(num); + }); + } + this.form.printList = o.length > 0 ? o : []; + + console.log("this.form",this.form); + add(this.form).then(() => { + this.box = false; + this.onLoad(this.page); + this.$message({ + type: "success", + message: "操作成功!" + }); + this.contextmenuFlag = false; + this.$store.commit('DEL_TAG_CURRENT'); + this.$router.push(this.tagWel); + }); + } else { + update(this.form).then(() => { + this.box = false; + this.onLoad(this.page); + this.$message({ + type: "success", + message: "操作成功!" + }); + }) + } + } + }) - console.log("this.form",this.form); - add(this.form).then(() => { - this.box = false; - this.onLoad(this.page); - this.$message({ - type: "success", - message: "操作成功!" - }); - this.contextmenuFlag = false; - this.$store.commit('DEL_TAG_CURRENT'); - this.$router.push(this.tagWel); - }); - } else { - update(this.form).then(() => { - this.box = false; - this.onLoad(this.page); - this.$message({ - type: "success", - message: "操作成功!" - }); - }) - } }, handleAdd () { this.title = '新增' @@ -751,6 +804,11 @@ export default { selectionChange (list) { this.selectionList = list; }, + handleHighlightChangeTable(row) { + if(!row.disabled){ + this.$refs.table.toggleRowSelection(row); + } + }, selectionChangeStock (list) { this.selectionListStock = list; }, @@ -801,6 +859,7 @@ export default { this.loading = true; this.query.stockArticleId = 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; this.page.total = dataList.total; this.dataList = dataList.records; diff --git a/src/views/distribution/stockup/distributionStockup.vue b/src/views/distribution/stockup/distributionStockup.vue index 28c15261..7d863bb0 100644 --- a/src/views/distribution/stockup/distributionStockup.vue +++ b/src/views/distribution/stockup/distributionStockup.vue @@ -24,8 +24,8 @@
- 新 增 - 删 除 + 指派叉车司机
diff --git a/src/views/distribution/stockup/distributionStockupDetailsSelf.vue b/src/views/distribution/stockup/distributionStockupDetailsSelf.vue new file mode 100644 index 00000000..c395c047 --- /dev/null +++ b/src/views/distribution/stockup/distributionStockupDetailsSelf.vue @@ -0,0 +1,748 @@ + + + + + diff --git a/src/views/distribution/stockup/distributionStockupDiscuss.vue b/src/views/distribution/stockup/distributionStockupDiscuss.vue index c298a01e..f5c39a2b 100644 --- a/src/views/distribution/stockup/distributionStockupDiscuss.vue +++ b/src/views/distribution/stockup/distributionStockupDiscuss.vue @@ -1,7 +1,7 @@ diff --git a/src/views/distribution/stockup/distributionStockupMarket.vue b/src/views/distribution/stockup/distributionStockupMarket.vue index b2ebc75b..5a149179 100644 --- a/src/views/distribution/stockup/distributionStockupMarket.vue +++ b/src/views/distribution/stockup/distributionStockupMarket.vue @@ -24,15 +24,15 @@
- 新 增 - 删 除 - 指派叉车司机 + + 指派叉车司机
- - + + @@ -54,7 +54,9 @@ > @@ -76,7 +78,7 @@ - + - + - - + + { item.head = false; @@ -454,6 +457,31 @@ export default { } }, methods: { + //选择 + getForklift(row,ty){ + console.log("执行了了了了",row); + switch (ty){ + case '1': + let x = this.forkliftData.find(i =>i.dictKey==row); + // console.log("xxx",x); + this.form.forkliftName = x.dictValue; + break; + case '2': + let b = this.loaderData.find(i =>i.dictKey == row) + this.form.loaderName = b.dictValue; + break; + case '3': + let f = this.goodsAreaIdData.find(i =>i.dictKey == row) + console.log("fff",f); + this.form.stockupArea = f.dictValue; + break; + } + + + + }, + + showdrawer(value){ this.drawerShow=value }, @@ -461,10 +489,19 @@ export default { * 弹窗的勾选回调，用于更改头部数组 * 固定搭配，只需要更换 columnList */ - setnewcolum(newarr, headarr) { + setnewcolum(newarr, headarr,type) { // console.log(newarr,'+++++++++++') - this.columnList = newarr; - this.$functions.setStorage(window.location.pathname, headarr); + 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); @@ -482,44 +519,79 @@ export default { }, 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); }, //查询备货 getStockUp(row){ console.log("row",row); let params = {}; switch (row) { - case '1': - params.stockupStatus = '2' - break; - case '2': - params.stockupStatus = '3' - break; + case '1': + params.stockupStatus = '2' + break; + case '2': + params.stockupStatus = '3' + break; } getList(this.page.currentPage, this.page.pageSize, params).then(res => { const data = res.data.data; this.page.total = data.total; this.data = data.records; this.loading = false; - // this.selectionClear(); + this.selectionClear(); }); }, //查询叉车人员 async getFork(){ let ides = ''; let ide = { }; - await getListUser().then(res =>{ + let b = false; + await getListUser().then(res =>{ //查询当前人信息 // console.log("res>>>",res.data.data); + if(res.data.data.userName != 'admin'){ + b = true; + } ides = res.data.data.tenantId; this.deptId = res.data.data.deptId; }) - await getPostList(ides).then(res =>{ - // console.log(">>>>",res.data.data); + await getPostList(ides).then(res =>{ // 查询角色 + // console.log("查询>>>>",res.data.data); res.data.data.forEach(i =>{ if(i.postName == "叉车"){ ide = i; @@ -528,11 +600,16 @@ export default { }) // console.log("ied>>>>>",ide); let params={ - postId: ide.id, //岗位 + // postId: ide.id, //岗位 deptId: this.deptId, //部门 // roleId: '', //角色 } - getListOwn(Object.assign(params, this.query)).then(res =>{ + if(b){ + // console.log("进来了"); + params.postId = ide.id;//岗位 + } + // console.log("查询人员信息",params); + getListOwn(Object.assign(params, this.query)).then(res =>{ //查询人员 // console.log(".............",res.data.data); let fo = []; res.data.data.forEach( i =>{ @@ -544,8 +621,8 @@ export default { }); this.forkliftData = fo; }) - await this.getStorageArea(); - await this.getTeam(); + await this.getStorageArea(); + await this.getTeam(); }, //查询班组 @@ -584,19 +661,34 @@ export default { this.goodsAreaIdData = fo; }) }, - handleForklift(){ - if (this.selectionList.length === 0) { - this.$message.warning("请选择至少一条数据"); - return; - } - this.dialogFormCustomer = true; - this.getFork(); - this.getTeam() - + /** + * 指派叉车查询的司机 + */ + handleForklift(){ + if (this.selectionList.length === 0) { + this.$message.warning("请选择至少一条数据"); + return; + } + let a = false ; + this.selectionList.some(i =>{ + if(i.assignStatus == "2"){ + a = true; + return; + } + }) + // = this.selectionList.findIndex(i => i.assignStatus == 2); + if(!a){ + this.dialogFormCustomer = true; + this.getFork(); + this.getTeam() + }else{ + this.$message.warning("已指派，请勿重复指派！！！") + } }, //确定指派 callFordelivery(){ this.form.ids = this.ids; + console.log("数据》》》",this.form); addAssign(this.form).then(res =>{ this.$message({ type: "success", @@ -605,7 +697,6 @@ export default { this.onLoad(this.page); this.dialogFormCustomer = false; }) - }, init () { this.height = this.setPx(document.body.clientHeight - 340); @@ -665,12 +756,21 @@ export default { }); }, handleView (row) { - this.title = '查看' - this.view = true; - this.box = true; - getDetail(row.id).then(res => { - this.form = res.data.data; - }); + // this.title = '查看' + // this.view = true; + // this.box = true; + // getDetail(row.id).then(res => { + // this.form = res.data.data; + // }); + this.$router.push({ + path: '/distribution/stockup/distributionStockupDetails', + query: { + id : row.row.id, + name: "备货明细" + }, + }) + + }, handleDelete () { if (this.selectionList.length === 0) { @@ -720,7 +820,7 @@ export default { this.selectionList = list; }, selectionClear () { - this.selectionList = []; + // this.selectionList = []; // this.$refs.table.clearSelection(); }, currentChange (currentPage) { @@ -738,31 +838,30 @@ export default { const data = res.data.data; this.page.total = data.total; this.data = data.records; - this.data.forEach(async i =>{ - /*if(i.forklift != "-1"){ - console.log("i==",i); - let a = await getUser(i.forklift); - i.forklift =a.data.data.name; - }*/ - - let s =this.distributionType.find(d => d.dictKey == i.typeService); - // console.log("sssss",s); - i.typeServiceName = s.dictValue; - i.loader = i.groupName; - i.stockupArea = i.headline; - if(i.assignStatus == '2'){ - i.assignStatusName = '已指派'; - }else{ - i.assignStatusName = '未指派'; - } - if(i.stockupStatus == '2'){ - i.stockupStatusName = '待备货'; - }else if(i.stockupStatus == '3'){ - i.stockupStatusName = '已备货'; - }else{ - i.stockupStatusName = '未备货'; - } - }); + this.data.forEach(async i =>{ + /* if(i.forkliftId != "-1"){ + console.log("i==",i); + let a = await getUser(i.forkliftId); + i.forkliftId =a.data.data.name; + }*/ + let s =this.distributionType.find(d => d.dictKey == i.typeService); + // console.log("sssss",s); + i.typeServiceName = s.dictValue; + i.loader = i.groupName; + i.stockupArea = i.headline; + if(i.assignStatus == '2'){ + i.assignStatusName = '已指派'; + }else{ + i.assignStatusName = '未指派'; + } + if(i.stockupStatus == '2'){ + i.stockupStatusName = '待备货'; + }else if(i.stockupStatus == '3'){ + i.stockupStatusName = '已备货'; + }else{ + i.stockupStatusName = '未备货'; + } + }); this.selectionClear(); this.loading = false; }); diff --git a/src/views/distribution/stockup/distributionStockupSelf.vue b/src/views/distribution/stockup/distributionStockupSelf.vue index 22c10182..9b84f4f7 100644 --- a/src/views/distribution/stockup/distributionStockupSelf.vue +++ b/src/views/distribution/stockup/distributionStockupSelf.vue @@ -1,7 +1,7 @@