From ae68db0801b89aa31c4a4d4e506a68c641da97b3 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期四, 30 十一月 2023 17:42:50 +0800
Subject: [PATCH] 6
---
web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue | 1 +
web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue | 12 ++++++++++--
modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java | 5 +++--
3 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java
index c47a870..61432bf 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java
@@ -144,8 +144,9 @@
ConfigItemWarehouse configItemWarehouse = this.get(warehouseId);
data.setConfigItemWarehouse(configItemWarehouse);
- projectId = configItemWarehouse.getProjectId();
-
+ if (projectId==null) {
+ projectId = configItemWarehouse.getProjectId();
+ }
List<WarehouseCmAudit> CmAuditList = cmAuditService.getList(warehouseId);
data.setCmAuditList(CmAuditList);
List<WarehouseQaAudit> QaAuditList = qaAuditService.getList(warehouseId);
diff --git a/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue b/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue
index f3ea8a0..c95ca02 100644
--- a/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue
+++ b/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue
@@ -238,6 +238,7 @@
cmAuditList:[],
configItemList:[],
qaAuditList:[],
+ flowInfoDto: {}
}
}
},
@@ -260,8 +261,6 @@
}
if(row.projectId){
this.dataForm.projectId =row.projectId
- } else {
- this.dataForm.projectId=row.bizId
}
this.getInfo()
if (!this.dataForm.disabled) {
@@ -293,6 +292,15 @@
...this.dataForm,
...res.data
}
+ if(this.dataForm.project === null){
+ this.dataForm.project={}
+ }
+ if(this.dataForm.configItemWarehouse === null){
+ this.dataForm.circulatOrder={}
+ }
+ if(this.dataForm.flowInfoDto === null){
+ this.dataForm.flowInfoDto={}
+ }
console.log(this.dataForm,"getInfo this.dataForm")
},
// 琛ㄥ崟鎻愪氦
diff --git a/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue b/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue
index c245334..49a7222 100644
--- a/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue
+++ b/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue
@@ -311,6 +311,7 @@
if(row.projectId){
this.dataForm.projectId =row.projectId
}
+
// this.dataForm.disabled
this.getInfo()
if (!this.dataForm.disabled) {
--
Gitblit v1.9.1