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] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E5=85=A5=E5=BA=93=E7=BC=96?=
=?UTF-8?q?=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 @@
+
+
+
+ 编码管理
+ 数量管理
+
+
报告管理
-
+
入库
@@ -150,7 +157,30 @@
![]()
-
+
+
+
+
+ 入库
+
+
+
+
+
+
+
+
+
+
+
@@ -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 @@
-
+