6

jinlin

2023-11-30 ae68db0801b89aa31c4a4d4e506a68c641da97b3

6

 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);

 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")
      },
      // 表单提交

 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) {