modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/dto/ConfigItemWarehouseDto.java
@@ -9,6 +9,7 @@ import com.zt.life.modules.project.model.Project; import com.zt.life.modules.sysBaseInfo.model.TestAgencyInfo; import com.zt.life.sys.dto.OssDto; import com.zt.modules.workflow.dto.FlowInfoDto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -26,6 +27,7 @@ @ApiModelProperty(value = "配置项入库") private ConfigItemWarehouse configItemWarehouse; private FlowInfoDto flowInfoDto; @ApiModelProperty(value = "入库配置项") private List<WarehouseConfigItem> configItemList = new ArrayList<>(); modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/ConfigItemWarehouse.java
@@ -45,6 +45,9 @@ @ApiModelProperty(value = "QA审核人") private String qaAuditor; @ApiModelProperty(value = "QA审核人ID") private String qaAuditorId; @ApiModelProperty(value = "QA审核日期") @JsonFormat(pattern = "yyyy-MM-dd") private Date qaAuditDate; @@ -54,6 +57,9 @@ @ApiModelProperty(value = "CM审核人") private String cmAuditor; @ApiModelProperty(value = "CM审核人ID") private String cmAuditorId; @ApiModelProperty(value = "CM审核日期") @JsonFormat(pattern = "yyyy-MM-dd") @@ -75,6 +81,9 @@ @ApiModelProperty(value = "操作人") private String operator; @ApiModelProperty(value = "操作人ID") private String operatorId; @ApiModelProperty(value = "操作日期") @JsonFormat(pattern = "yyyy-MM-dd") private Date operateDate; modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/WarehouseConfigItem.java
@@ -1,5 +1,6 @@ package com.zt.life.modules.configItemWarehouse.model; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.zt.common.entity.BusiEntity; import com.zt.life.sys.dto.OssDto; @@ -43,6 +44,7 @@ @ApiModelProperty(value = "密级") private String secretClass; @TableField(exist = false) @ApiModelProperty(value = "附件") private OssDto files; } modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java
@@ -18,6 +18,8 @@ import com.zt.life.sys.service.SysOssConfigService; import com.zt.modules.coderule.service.SysCodeRuleService; import com.zt.modules.oss.service.SysOssService; import com.zt.modules.workflow.dto.FlowInfoDto; import com.zt.modules.workflow.service.WorkflowService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.zt.common.db.query.QueryFilter; @@ -42,7 +44,7 @@ private SysOssService sysOssService; @Autowired private TestAgencyInfoService testAgencyInfoService; private WorkflowService workflowService; @Autowired private SysCodeRuleService sysCodeRuleService; @@ -122,6 +124,16 @@ qaAuditService.insert(qaAudit); } } Long bizId = configItemDto.getConfigItemWarehouse().getId(); FlowInfoDto flowInfoDto = configItemDto.getFlowInfoDto(); if (flowInfoDto != null && "tj,bl".contains(flowInfoDto.getSubmitType())) { if ("tj".equals(flowInfoDto.getSubmitType())) { workflowService.startFlow(flowInfoDto.getFlowCode(), bizId); } workflowService.approvePass(flowInfoDto.getFlowCode(), bizId, flowInfoDto.getStepIdMark()); } return true; }
@@ -1,5 +1,5 @@ <template> <zt-dialog ref="dialog" column="3" @confirm="formSubmit"> <zt-dialog ref="dialog" column="3" :title="title" :stepMarker="stepMarker" @confirm="formSubmit" > <el-form ref="dataForm" style="padding-top: 0" :inline="true" :disabled="dataForm.disabled" :model="dataForm" label-width="120px" class="warehouseFormAuto"> <div > <el-form-item label-width="60px" label="编号:" style="width:100%;margin-bottom: -5px"> @@ -208,6 +208,8 @@ return { disabled:true, dataForm: { stepMarker: '', title: '查看', id: '', configItemWarehouse:{ id:"", @@ -253,6 +255,15 @@ this.dataForm.projectId = row.projectId // this.dataForm.disabled this.getInfo() if (!this.dataForm.disabled) { if (!row.stepMarker) { this.stepMarker = 'pzxrk_first' this.title = '入库申请' } else { this.title = row.stepName this.stepMarker = row.stepMarker } } console.log(this.dataForm.id,this.dataForm.projectId,'params params') }, addConfigItemWarehouseRow(){ @@ -276,7 +287,15 @@ console.log(this.dataForm,"getInfo this.dataForm") }, // 表单提交 async formSubmit() { async formSubmit(submitType) { if (submitType == 'tj' || submitType == 'bl') { let flowInfo = { flowCode: 'pzxrk', stepIdMark: this.stepMarker, submitType: submitType } this.dataForm.flowInfoDto = flowInfo; } let res = await this.$http[!this.dataForm.id ? 'post' : 'put']('/configItemWarehouse/ConfigItemWarehouse/', this.dataForm) if (res.success) { await this.$tip.success() web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue
@@ -311,7 +311,7 @@ if(row.projectId){ this.dataForm.projectId =row.projectId } else { this.dataForm.projectId=row.bizGroupId this.dataForm.projectId=row.bizId } // this.dataForm.disabled this.getInfo()
