modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java
@@ -23,6 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.zt.common.db.query.QueryFilter; import javax.annotation.Resource; import java.util.HashMap; import java.util.List; @@ -128,7 +129,7 @@ Long bizId = configItemDto.getConfigItemWarehouse().getId(); FlowInfoDto flowInfoDto = configItemDto.getFlowInfoDto(); if (flowInfoDto != null && "tj,bl".contains(flowInfoDto.getSubmitType())) { if (flowInfoDto != null && flowInfoDto.getBizId() != null && "tj,bl".contains(flowInfoDto.getSubmitType())) { if ("tj".equals(flowInfoDto.getSubmitType())) { workflowService.startFlow(flowInfoDto.getFlowCode(), bizId); } modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/model/ItemCirculatOrder.java
@@ -64,16 +64,6 @@ @ApiModelProperty(value = "校准检测情况说明") private String detectSituation; /* @ApiModelProperty(value = "物品入库人") private String warehousePerson; @ApiModelProperty(value = "物品入库时间") @JsonFormat(pattern = "yyyy-MM-dd") private Date warehouseDate; @ApiModelProperty(value = "物品入库情况") private String warehouseSituation;*/ @ApiModelProperty(value = "物品发放人") private String itemIssuer;
@@ -120,7 +120,7 @@ Long bizId = itemCirculatOrderDto.getCirculatOrder().getId(); FlowInfoDto flowInfoDto = itemCirculatOrderDto.getFlowInfoDto(); if (flowInfoDto != null && "tj,bl".contains(flowInfoDto.getSubmitType())) { if (flowInfoDto != null && flowInfoDto.getBizId() != null && "tj,bl".contains(flowInfoDto.getSubmitType())) { if ("tj".equals(flowInfoDto.getSubmitType())) { workflowService.startFlow(flowInfoDto.getFlowCode(), bizId); } @@ -154,7 +154,15 @@ if (projectId != null) { data.setProjectId(projectId); data.setProject(projectService.get(projectId)); Project project = projectService.get(projectId); String type = project.getSoftwareType(); if (type == "3") { type = "2"; } else { type = "1"; } project.setSoftwareType(type); data.setProject(project); } if (data.getTestAgencyInfo() == null) modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java
@@ -80,14 +80,8 @@ EnvironDto data = environService.getDto(environId, projectId); if (environId != null) { OssDto ossDto = sysOssConfigService.getOssByBusiType(environId, "test_environt_diagram"); List<SysOss> sysOss1 =sysOssService.getSysOssByBusiIdAnd(environId,"test_environt_diagram"); String Url = ""; for (SysOss sysOss: sysOss1){ Url=sysOss.getUrl(); } if (ossDto != null) { data.setFiles(ossDto); data.setUrl(Url); } } return Result.ok(data); web/src/components/config-uploader/src/config-uploader.vue
@@ -53,7 +53,7 @@ <zt-uploader v-model="dataForm[scope.row.busiField]" :dataForm="dataForm" multiple :limit="scope.row.fileLimit" :file-type="scope.row.fileTypeArr" :showFileList2="false" :accept="scope.row.accept" :file-size="scope.row.fileSize" @input="change(scope.row.busiField)"/> @input="change(scope.row.busiField)" @getUploaderImg="getUploaderImg"/> </template> </el-table-column> </el-table> @@ -144,16 +144,28 @@ } return null }, getUploaderImg(list) { // this.imageList = list if (list[0].url) { this.$emit('getImageUrl', list[0].url) } }, change(busiField) { console.log(busiField, 'config_uploader change(busiField) busiField') this.fields.forEach(field => { if (field.busiField === busiField) { field.files.length = 0 this.dataForm[busiField].forEach(file => field.files.push(file)) this.dataForm[busiField].forEach(file => { field.files.push(file) } ) if (this.dataForm) { this.dataForm.hasUploadFinsh = 100 } } }) console.log(this.dataForm, 'config_uploader change(busiField)') this.$emit('getImageUrl') } } } @@ -162,6 +174,7 @@ .config-uploader label { width: 260px !important; } .zt .el-upload-list__item .el-progress{ top:15px !important; } web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue
@@ -142,7 +142,7 @@ </el-table> <div class="el-border-top"> <el-form-item label="审核结果" style="width: 99%"> <zt-dict v-model="dataForm.configItemWarehouse.cmAuditResults" placeholder="审核结果" dict="is_pass" :radio="true" <zt-dict :disabled="getRoleName.indexOf('CM角色')===-1" v-model="dataForm.configItemWarehouse.cmAuditResults" placeholder="审核结果" dict="is_pass" :radio="true" clearable></zt-dict> </el-form-item> <el-form-item label="审核人：" style="width: 48%"> @@ -177,7 +177,7 @@ </div> <div style="width: calc(100% - 120px)" class="el-border-left"> <el-form-item class="el-CMTextarea" style="width: 100%;padding: 5px"> <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="dataForm.configItemWarehouse.projectCmOperations"></el-input> <el-input v-if="getRoleName.indexOf('CM角色')>=0" type="textarea" :rows="2" placeholder="请输入内容" v-model="dataForm.configItemWarehouse.projectCmOperations"></el-input> </el-form-item> <el-form-item label-width="80%" label="操作人：" style="width: 65%"> <span>{{dataForm.configItemWarehouse.operator}}</span> web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue
@@ -185,7 +185,7 @@ </div> <div class="el-border-left " style="width: 35%;height: 40px;"> <el-form-item label="是否满足测试要求" label-width="150px" style="padding-left:20px;margin-bottom:0"> <zt-dict v-model="dataForm.circulatOrder.detectSituation" :radio="true" dict="is_or_not"></zt-dict> <zt-dict :disabled="getRoleName.indexOf('QA角色')===-1" v-model="dataForm.circulatOrder.detectSituation" :radio="true" dict="is_or_not"></zt-dict> </el-form-item> </div> </div> @@ -248,7 +248,7 @@ </div> <div class="el-border-left " style="width: 20%;height: 40px"> <el-form-item style="width: 100%;padding-left:20px;margin:0;"> <el-input v-model="dataForm.circulatOrder.itemAcceptr"></el-input> <el-input v-model="dataForm.circulatOrder.remark"></el-input> </el-form-item> </div> </div> @@ -297,6 +297,12 @@ } } }, computed:{ getRoleName(){ console.log(this.$store.state.user.roleName,'this.$store.state.user.roleName') return this.$store.state.user.roleName || '' }, }, methods: { indexFormat(index) { return index += 1 web/src/views/modules/project/Environ-AddOrUpdate.vue
@@ -1,6 +1,7 @@ <template> <zt-dialog ref="dialog" column="2" @confirm="formSubmit" append-to-body title="测试环境建立确认表"> <el-form :model="dataForm" style="padding-top: 0" :inline="true" ref="dataForm" :disabled="dataForm.disabled" label-width="130px" class="confirmFormAuto"> <el-form :model="dataForm" style="padding-top: 0" :inline="true" ref="dataForm" :disabled="dataForm.disabled" label-width="130px" class="confirmFormAuto"> <div class="DConfirmForm"> <el-form-item label-width="60px" label="编号:" style="width:100%;margin-bottom: 0"> <span>{{dataForm.environ.code}}</span> @@ -26,7 +27,8 @@ <div class="el-wt-border-left" style="padding-left:5px;width: calc(100% - 130px)"> <div style="padding: 5px">软件资源：</div> <div class="table-container"> <el-table ref="tableSoftwareList" class="el-software el-margin-top-bot" border :data="dataForm.softwareResourcesList" <el-table ref="tableSoftwareList" class="el-software el-margin-top-bot" border :data="dataForm.softwareResourcesList" stripe> <el-table-column prop="no" align="center" width="80" label="序号"> <template slot-scope="scope"> @@ -61,7 +63,8 @@ </div> <div style="padding: 5px">硬件资源：</div> <div class="table-container"> <el-table ref="tableHardwareList" class="el-software el-margin-top-bot" border :data="dataForm.hardwareResourcesList" <el-table ref="tableHardwareList" class="el-software el-margin-top-bot" border :data="dataForm.hardwareResourcesList" stripe> <el-table-column prop="no" align="center" width="80" label="序号"> <template slot-scope="scope"> @@ -123,7 +126,8 @@ </div> <div class="el-wt-border-left" style="padding-left:5px;width: calc(100% - 130px)"> <div class="table-container"> <el-table ref="tableEnvironeList" class="el-software el-margin-top-bot" border :data="dataForm.environAnalysisList" <el-table ref="tableEnvironeList" class="el-software el-margin-top-bot" border :data="dataForm.environAnalysisList" stripe> <el-table-column prop="no" align="center" width="80" label="序号"> <template slot-scope="scope"> @@ -251,6 +255,7 @@ this.dataForm.projectId = row.projectId // this.dataForm.disabled this.getInfo() this.getImageUrl() console.log(this.dataForm.id,this.dataForm.projectId,'params params') }, // 获取信息 @@ -290,9 +295,27 @@ tableBody.scrollTop = tableBody.scrollHeight; }) }, getImageUrl(url){ this.dataForm.url = url getImageUrl() { let pictureId = this.getFirstImageId(this.dataForm.files, 'test_environt_diagram') this.dataForm.url = `${window.SITE_CONFIG['apiURL']}/sys/oss/content2?fileId=${pictureId}` console.log(this.dataForm.url,' this.dataForm.url') }, getFirstImageId(oss) { console.log(oss, ' getFirstImageId(oss)') let fileId = 0 if (oss != null) { if (oss.groups.length > 0) { let group = oss.groups[0] if (group.fields.length > 0) { let field = group.fields[0] if (field.files.length > 0) { let file = field.files[0] fileId = file.id } } } } return fileId }, // 表单提交 async formSubmit() { @@ -311,6 +334,7 @@ width: 70%; margin: 0 auto; } .confirmDAuto{ border: 1px solid rgba(0,0,0,.2); } @@ -323,6 +347,7 @@ .DFormWidth { width: 120px; } .DConfirmForm { /*border-left: 1px solid;*/ width: 100%; @@ -331,23 +356,29 @@ .DConfirmForm > .el-form-item > .el-form-item__content { width: calc(100% - 130px); } .DConfirmForm > .el-form-item.isKill > .el-form-item__content { width: calc(100% - 180px); } .el-form-border{ border-top: 1px solid rgba(0,0,0,.2); border-bottom: 1px solid rgba(0,0,0,.2); } .el-B-border{ border-bottom: 1px solid rgba(0,0,0,.2); } .el-margin-top-bot{ margin-top:5px; margin-bottom:5px; } .el-wt-border-left{ border-left:1px solid rgba(0,0,0,.2); } .zt .el-table.el-software th { background: transparent; } @@ -355,12 +386,15 @@ .zt .el-table.el-software th > .cell { font-weight: 500; } .DHold{ font-weight: 600; } .zt .el-table.el-software{ font-size: 14px; } .confirmFormAuto .marginTopAndMarginBottom { margin-top: 10px !important; margin-bottom: 0 !important; @@ -370,6 +404,7 @@ margin-top: -10px !important; margin-bottom: 10px !important; } .confirmFormAuto .marginTopAndMarginBottom3 { margin-top: 0 !important; margin-bottom: 10px !important;
