From b72fb1c1c43deff6c263c3d8ca5087d3f6f2ce61 Mon Sep 17 00:00:00 2001 From: zzyuan <781948537@qq.com> Date: Mon, 18 Nov 2024 10:19:25 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E7=BC=96=E7=A0=81=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/purchase/goodsEntry/detail.vue | 67 ++++++++++++++----- .../material/purchase/goodsEntry/index.vue | 4 +- 2 files changed, 54 insertions(+), 17 deletions(-) diff --git a/src/views/material/purchase/goodsEntry/detail.vue b/src/views/material/purchase/goodsEntry/detail.vue index d7338bb0..1b419ac9 100644 --- a/src/views/material/purchase/goodsEntry/detail.vue +++ b/src/views/material/purchase/goodsEntry/detail.vue @@ -79,13 +79,20 @@ + + + - + @@ -216,6 +246,9 @@ export default { // 上传的地址 url: process.env.VUE_APP_BASE_API + '/file/upload' }, + //编码入库 + openCode:false, + codeTableData:[] }; }, mounted() { @@ -297,19 +330,23 @@ export default { this.multiple = !selection.length }, //入库 - pass(row) { - let obj = { - // taskId: this.taskId, - purchaseId: row.id - }; - console.log(obj) - purchaseWarehouse(obj).then((res)=>{ - console.log(res) - if(res.code==200){ - this.$modal.msgSuccess('操作成功') - this.getList() - } - }) + pass(row) { + if(row.manageType==0){//编码 + + this.openCode=true + }else{ + this.$modal.confirm('是否确认新购入库该物资类型？').then(function() { + let obj = { + purchaseId: row.id + }; + return purchaseWarehouse(obj) + }).then((res) => { + if(res.code==200){ + this.$modal.msgSuccess('入库成功') + this.getList() + } + }).catch(() => {}); + } }, //不合格 reject(row) { diff --git a/src/views/material/purchase/goodsEntry/index.vue b/src/views/material/purchase/goodsEntry/index.vue index 3eb2a3a2..c11c4b01 100644 --- a/src/views/material/purchase/goodsEntry/index.vue +++ b/src/views/material/purchase/goodsEntry/index.vue @@ -60,7 +60,7 @@ - + Date: Mon, 18 Nov 2024 13:47:20 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E7=BC=96=E7=A0=81=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/purchase/goodsEntry.js | 12 ++- .../material/purchase/goodsAccept/detail.vue | 2 +- .../material/purchase/goodsEntry/detail.vue | 87 ++++++++++++++----- .../material/purchase/goodsEntry/index.vue | 2 +- 4 files changed, 80 insertions(+), 23 deletions(-) diff --git a/src/api/purchase/goodsEntry.js b/src/api/purchase/goodsEntry.js index b5e9b9ed..b6452df6 100644 --- a/src/api/purchase/goodsEntry.js +++ b/src/api/purchase/goodsEntry.js @@ -17,4 +17,14 @@ export function purchaseWarehouse(data) { method: 'post', data: data }) -} \ No newline at end of file +} + + +// 查询入库编码列表 +export function getMachineById(data) { + return request({ + url: '/material/purchase/storage/getMachineById', + method: 'post', + data: data + }) +} diff --git a/src/views/material/purchase/goodsAccept/detail.vue b/src/views/material/purchase/goodsAccept/detail.vue index b5537b7e..d7eb2c6e 100644 --- a/src/views/material/purchase/goodsAccept/detail.vue +++ b/src/views/material/purchase/goodsAccept/detail.vue @@ -307,7 +307,7 @@
-
验收结论：
+
验收结论：
--> - + @@ -161,14 +161,23 @@ - 入库 + 入库 - + + - - - + + + + + + + Date: Tue, 19 Nov 2024 09:12:57 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/purchase/goodsArrived/component/addTools.vue | 2 +- .../material/purchase/goodsArrived/component/home.vue | 7 ++++++- vue.config.js | 6 +++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/views/material/purchase/goodsArrived/component/addTools.vue b/src/views/material/purchase/goodsArrived/component/addTools.vue index 226816ac..598c772f 100644 --- a/src/views/material/purchase/goodsArrived/component/addTools.vue +++ b/src/views/material/purchase/goodsArrived/component/addTools.vue @@ -794,7 +794,7 @@ export default { } }) this.equipmentList.forEach((item, index) => { - if (item.id == row.id) { + if (item.typeId == row.typeId) { this.equipmentList.splice(index, 1) } }) diff --git a/src/views/material/purchase/goodsArrived/component/home.vue b/src/views/material/purchase/goodsArrived/component/home.vue index 724f7982..26fd9777 100644 --- a/src/views/material/purchase/goodsArrived/component/home.vue +++ b/src/views/material/purchase/goodsArrived/component/home.vue @@ -187,7 +187,12 @@ 未完成 --> - +