From 27410959f19cf24ca0613510da2274a38fc79e69 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 10 十一月 2023 10:29:53 +0800
Subject: [PATCH] Changes

---
 modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrderDeliverable.java                |    7 +
 modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderMeasuredDao.xml                               |   14 ++++
 modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java                           |   25 ++++++++
 modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDeliverableDao.xml                            |    9 +++
 modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java                  |    1 
 modules/mainPart/src/main/java/com/zt/life/modules/project/dao/SoftwareTestOrderMeasuredDao.java                  |    5 +
 web/src/views/modules/project/Project-AddOrUpdate.vue                                                             |   25 ++++----
 modules/mainPart/src/main/java/com/zt/life/modules/project/dto/ProjectDto.java                                    |    3 
 modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderDeliverableController.java |    2 
 modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrderMeasured.java                   |    8 ++
 modules/mainPart/src/main/java/com/zt/life/modules/project/dao/SoftwareTestOrderDeliverableDao.java               |    3 
 modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java                      |    8 ++
 modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderMeasuredController.java    |    2 
 modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderDeliverableService.java       |   10 +++
 modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderMeasuredService.java          |   11 +++
 modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java            |   26 +++++++-
 16 files changed, 128 insertions(+), 31 deletions(-)

diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java
index ebaca06..a7e558e 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java
@@ -46,7 +46,12 @@
         @ApiImplicitParam(name = Constant.Q.LIMIT, value = Constant.QV.LIMIT, required = true, dataType = Constant.QT.INT),
         @ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
         @ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
-        @ApiImplicitParam(name = "softwareName", value = "杞欢鍚嶇О", dataType = Constant.QT.STRING, format = "software_name^LK"),        @ApiImplicitParam(name = "secretClass", value = "瀵嗙骇", dataType = Constant.QT.STRING, format = "secret_class^EQ"),        @ApiImplicitParam(name = "criticalLevel", value = "鍏抽敭绛夌骇", dataType = Constant.QT.STRING, format = "critical_level^EQ"),        @ApiImplicitParam(name = "testLevel", value = "娴嬭瘯绾у埆", dataType = Constant.QT.STRING, format = "test_level^EQ"),        @ApiImplicitParam(name = "softwareType", value = "杞欢绫诲瀷", dataType = Constant.QT.STRING, format = "software_type^EQ"),        @ApiImplicitParam(name = "isContract", value = "鏄惁绛剧讲鍚堝悓", dataType = Constant.QT.STRING, format = "is_contract^EQ")    })
+        @ApiImplicitParam(name = "softwareName", value = "杞欢鍚嶇О", dataType = Constant.QT.STRING, format = "software_name^LK"),
+        @ApiImplicitParam(name = "secretClass", value = "瀵嗙骇", dataType = Constant.QT.STRING, format = "secret_class^EQ"),
+        @ApiImplicitParam(name = "criticalLevel", value = "鍏抽敭绛夌骇", dataType = Constant.QT.STRING, format = "critical_level^EQ"),
+        @ApiImplicitParam(name = "testLevel", value = "娴嬭瘯绾у埆", dataType = Constant.QT.STRING, format = "test_level^EQ"),
+        @ApiImplicitParam(name = "softwareType", value = "杞欢绫诲瀷", dataType = Constant.QT.STRING, format = "software_type^EQ"),
+        @ApiImplicitParam(name = "isContract", value = "鏄惁绛剧讲鍚堝悓", dataType = Constant.QT.STRING, format = "is_contract^EQ")    })
     public PageResult<Project> page(@ApiIgnore @QueryParam QueryFilter queryFilter){
 
         return PageResult.ok(projectService.page(queryFilter));
@@ -56,7 +61,6 @@
     @ApiOperation("淇℃伅")
     public Result<Project> get(@PathVariable("id") Long id){
         Project data = projectService.get(id);
-
         return Result.ok(data);
     }
 
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java
index 6b8bf9f..b74ea00 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java
@@ -12,8 +12,14 @@
 import com.zt.common.validator.group.AddGroup;
 import com.zt.common.validator.group.DefaultGroup;
 import com.zt.common.validator.group.UpdateGroup;
+import com.zt.life.modules.project.dto.ProjectDto;
 import com.zt.life.modules.project.model.SoftwareTestOrder;
+import com.zt.life.modules.project.service.ProjectService;
+import com.zt.life.modules.project.service.SoftwareTestOrderDeliverableService;
+import com.zt.life.modules.project.service.SoftwareTestOrderMeasuredService;
 import com.zt.life.modules.project.service.SoftwareTestOrderService;
+import com.zt.life.modules.sysBaseInfo.model.TestAgencyInfo;
+import com.zt.life.modules.sysBaseInfo.service.TestAgencyInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -37,7 +43,15 @@
 @Api(tags="software_test_order")
 public class SoftwareTestOrderController {
     @Autowired
+    private ProjectService projectService;
+    @Autowired
     private SoftwareTestOrderService softwareTestOrderService;
+    @Autowired
+    private SoftwareTestOrderDeliverableService softwareTestOrderDeliverableService;
+    @Autowired
+    private SoftwareTestOrderMeasuredService softwareTestOrderMeasuredService;
+    @Autowired
+    private TestAgencyInfoService testAgencyInfoService;
 
     @GetMapping("page")
     @ApiOperation("鍒嗛〉")
@@ -56,12 +70,18 @@
 
     @GetMapping("{id}")
     @ApiOperation("淇℃伅")
-    public Result<SoftwareTestOrder> get(@PathVariable("id") Long id){
-        SoftwareTestOrder data = softwareTestOrderService.get(id);
-
+    public Result<ProjectDto> get(@PathVariable("id") Long id){
+        ProjectDto data = new ProjectDto();
+        SoftwareTestOrder softwareTestOrder = softwareTestOrderService.get(id);
+        data.setSoftwareTestOrder(softwareTestOrder);
+        data.setProject(projectService.get(softwareTestOrder.getProjectId()));
+        data.setTestAgencyInfo(testAgencyInfoService.get(softwareTestOrder.getAgencyId()));
+        data.setChildrenTable2(softwareTestOrderDeliverableService.childrenTables(softwareTestOrder.getId()));
+        data.setChildrenTable1(softwareTestOrderMeasuredService.childrenTables(softwareTestOrder.getId()));
         return Result.ok(data);
     }
 
+
     @PostMapping
     @ApiOperation("鏂板")
     @LogOperation("鏂板")
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderDeliverableController.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderDeliverableController.java
index 74e33d3..4aad41d 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderDeliverableController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderDeliverableController.java
@@ -30,7 +30,7 @@
  * software_test_order_deliverable
  *
  * @author zt generator 
- * @since 1.0.0 2023-11-08
+ * @since 1.0.0 2023-11-09
  */
 @RestController
 @RequestMapping("/project/SoftwareTestOrderDeliverable/")
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderMeasuredController.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderMeasuredController.java
index 5518aa4..2471e79 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderMeasuredController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderMeasuredController.java
@@ -30,7 +30,7 @@
  * software_test_order_measured
  *
  * @author zt generator 
- * @since 1.0.0 2023-11-08
+ * @since 1.0.0 2023-11-09
  */
 @RestController
 @RequestMapping("/project/SoftwareTestOrderMeasured/")
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/SoftwareTestOrderDeliverableDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/SoftwareTestOrderDeliverableDao.java
index 18667c8..1a50920 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/SoftwareTestOrderDeliverableDao.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/SoftwareTestOrderDeliverableDao.java
@@ -13,11 +13,12 @@
  * software_test_order_deliverable
  *
  * @author zt generator 
- * @since 1.0.0 2023-11-08
+ * @since 1.0.0 2023-11-09
  */
 @Mapper
 public interface SoftwareTestOrderDeliverableDao extends BaseDao<SoftwareTestOrderDeliverable> {
 
     List<SoftwareTestOrderDeliverable> getList(Map<String, Object> params);
+    List<SoftwareTestOrderDeliverable> childrenTables(Long id);
 
 }
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/SoftwareTestOrderMeasuredDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/SoftwareTestOrderMeasuredDao.java
index ebda491..bdc1dd3 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/SoftwareTestOrderMeasuredDao.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/SoftwareTestOrderMeasuredDao.java
@@ -1,6 +1,7 @@
 package com.zt.life.modules.project.dao;
 
 import com.zt.common.dao.BaseDao;
+import com.zt.life.modules.project.model.SoftwareTestOrderDeliverable;
 import com.zt.life.modules.project.model.SoftwareTestOrderMeasured;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -13,11 +14,11 @@
  * software_test_order_measured
  *
  * @author zt generator 
- * @since 1.0.0 2023-11-08
+ * @since 1.0.0 2023-11-09
  */
 @Mapper
 public interface SoftwareTestOrderMeasuredDao extends BaseDao<SoftwareTestOrderMeasured> {
 
     List<SoftwareTestOrderMeasured> getList(Map<String, Object> params);
-
+    List<SoftwareTestOrderMeasured> childrenTables(Long id);
 }
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/dto/ProjectDto.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/dto/ProjectDto.java
index 6cf4b86..8afb7ae 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/dto/ProjectDto.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/dto/ProjectDto.java
@@ -13,7 +13,7 @@
 import java.util.List;
 
 @Data
-public class ProjectDto extends Project {
+public class ProjectDto extends SoftwareTestOrder {
 
     private SoftwareTestOrder softwareTestOrder;
     private Project project;
@@ -22,6 +22,5 @@
     private List<SoftwareTestOrderMeasured> childrenTable1 = new ArrayList<>();
     @ApiModelProperty(value = "浜や粯浠�")
     private List<SoftwareTestOrderDeliverable> childrenTable2 = new ArrayList<>();
-
 }
 
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java
index 85cb239..f509648 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java
@@ -25,6 +25,9 @@
 	@ApiModelProperty(value = "椤圭洰ID")
 	private Long projectId;
 
+	@ApiModelProperty(value = "鏈烘瀯ID")
+	private Long agencyId;
+
 	@ApiModelProperty(value = "杩愯鐜")
 	private String optEnviron;
 
@@ -171,6 +174,28 @@
 	@ApiModelProperty(value = "鏄惁绛剧讲鍚堝悓")
 	private Integer isContract;
 
+
+	@TableField(exist = false)
+	@ApiModelProperty(value = "搴忓彿")
+	private Integer num;
+
+	@TableField(exist = false)
+	@ApiModelProperty(value = "濮旀墭鍗旾D")
+	private Long orderId;
+
+	@TableField(exist = false)
+	@ApiModelProperty(value = "鍚嶇О")
+	private String name;
+
+	@TableField(exist = false)
+	@ApiModelProperty(value = "鏍囪瘑/鐗堟湰")
+	private String identify;
+
+	@TableField(exist = false)
+	@ApiModelProperty(value = "鏄惁琚祴浠�")
+	private String isMeasured;
+
+
 	public String getEntrustUnitName() {
 		return entrustUnitName;
 	}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrderDeliverable.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrderDeliverable.java
index 2b034a1..0253771 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrderDeliverable.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrderDeliverable.java
@@ -13,7 +13,7 @@
  * software_test_order_deliverable
  *
  * @author zt generator 
- * @since 1.0.0 2023-11-08
+ * @since 1.0.0 2023-11-09
  */
 @Data
 @EqualsAndHashCode(callSuper=false)
@@ -22,7 +22,10 @@
 	private static final long serialVersionUID = 1L;
 
 	@ApiModelProperty(value = "搴忓彿")
-	private Integer code;
+	private Integer num;
+
+	@ApiModelProperty(value = "濮旀墭鍗旾D")
+	private Long orderId;
 
 	@ApiModelProperty(value = "鍚嶇О")
 	private String name;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrderMeasured.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrderMeasured.java
index ee95240..20da857 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrderMeasured.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrderMeasured.java
@@ -13,7 +13,7 @@
  * software_test_order_measured
  *
  * @author zt generator 
- * @since 1.0.0 2023-11-08
+ * @since 1.0.0 2023-11-09
  */
 @Data
 @EqualsAndHashCode(callSuper=false)
@@ -21,8 +21,12 @@
 public class SoftwareTestOrderMeasured extends BusiEntity {
 	private static final long serialVersionUID = 1L;
 
+
 	@ApiModelProperty(value = "搴忓彿")
-	private Integer code;
+	private Integer num;
+
+	@ApiModelProperty(value = "濮旀墭鍗旾D")
+	private Long orderId;
 
 	@ApiModelProperty(value = "鍚嶇О")
 	private String name;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderDeliverableService.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderDeliverableService.java
index 82defb9..97d70af 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderDeliverableService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderDeliverableService.java
@@ -13,7 +13,7 @@
  * software_test_order_deliverable
  *
  * @author zt generator 
- * @since 1.0.0 2023-11-08
+ * @since 1.0.0 2023-11-09
  */
 @Service
 public class SoftwareTestOrderDeliverableService  extends BaseService<SoftwareTestOrderDeliverableDao, SoftwareTestOrderDeliverable> {
@@ -29,6 +29,14 @@
     }
 
     /**
+     * 瀛愯〃鏌ヨ
+     *
+     */
+    public List<SoftwareTestOrderDeliverable> childrenTables(Long orderId) {
+        return baseDao.childrenTables(orderId);
+    }
+
+    /**
      * 鍒犻櫎
      *
      * @param ids
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderMeasuredService.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderMeasuredService.java
index 3855ea2..2d3fac2 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderMeasuredService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderMeasuredService.java
@@ -2,6 +2,7 @@
 
 import com.zt.common.service.BaseService;
 import com.zt.life.modules.project.dao.SoftwareTestOrderMeasuredDao;
+import com.zt.life.modules.project.model.SoftwareTestOrderDeliverable;
 import com.zt.life.modules.project.model.SoftwareTestOrderMeasured;
 import org.springframework.stereotype.Service;
 import com.zt.common.db.query.QueryFilter;
@@ -13,7 +14,7 @@
  * software_test_order_measured
  *
  * @author zt generator 
- * @since 1.0.0 2023-11-08
+ * @since 1.0.0 2023-11-09
  */
 @Service
 public class SoftwareTestOrderMeasuredService  extends BaseService<SoftwareTestOrderMeasuredDao, SoftwareTestOrderMeasured> {
@@ -29,6 +30,14 @@
     }
 
     /**
+     * 瀛愯〃鏌ヨ
+     *
+     */
+    public List<SoftwareTestOrderMeasured> childrenTables(Long orderId) {
+        return baseDao.childrenTables(orderId);
+    }
+
+    /**
      * 鍒犻櫎
      *
      * @param ids
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java
index 6526c7b..0c32f2e 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java
@@ -28,6 +28,7 @@
         return baseDao.getList(queryFilter.getQueryParams());
     }
 
+
     /**
      * 鍒犻櫎
      *
diff --git a/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDeliverableDao.xml b/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDeliverableDao.xml
index 693bcf9..b48dd83 100644
--- a/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDeliverableDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDeliverableDao.xml
@@ -16,5 +16,14 @@
             ORDER BY ${orderBySql}
         </if>
     </select>
+    <select id="childrenTables" resultType="com.zt.life.modules.project.model.SoftwareTestOrderDeliverable">
 
+        SELECT a.*
+        FROM software_test_order_deliverable a
+        INNER JOIN software_test_order p ON p.id = a.order_id
+        <where>
+            a.is_delete = 0
+            and p.is_delete = 0
+        </where>
+    </select>
 </mapper>
diff --git a/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderMeasuredDao.xml b/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderMeasuredDao.xml
index 28bbe72..d9f1633 100644
--- a/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderMeasuredDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderMeasuredDao.xml
@@ -17,4 +17,18 @@
         </if>
     </select>
 
+    <select id="childrenTables" resultType="com.zt.life.modules.project.model.SoftwareTestOrderMeasured">
+
+        SELECT a.*
+        FROM software_test_order_measured a
+        INNER JOIN software_test_order p ON p.id = a.order_id
+        <where>
+            a.is_delete = 0
+            <if test="whereSql!=null">
+                and ${whereSql}
+            </if>
+        </where>
+
+    </select>
+
 </mapper>
diff --git a/web/src/views/modules/project/Project-AddOrUpdate.vue b/web/src/views/modules/project/Project-AddOrUpdate.vue
index ffc6944..8041f43 100644
--- a/web/src/views/modules/project/Project-AddOrUpdate.vue
+++ b/web/src/views/modules/project/Project-AddOrUpdate.vue
@@ -60,8 +60,8 @@
           </div>
           <div class="DSTOld-1-Form">
             <!-- 鍗曚綅鍚嶇О -->
-            <zt-form-item label="杞欢鍚嶇О" prop="software" style="width: 49%" rules="required">
-              <el-input v-model="dataForm.software" placeholder="璇疯緭鍏ヨ蒋浠跺悕绉�"></el-input>
+            <zt-form-item label="杞欢鍚嶇О" prop="softwareName" style="width: 49%" rules="required">
+              <el-input v-model="dataForm.softwareName" placeholder="璇疯緭鍏ヨ蒋浠跺悕绉�"></el-input>
             </zt-form-item>
             <!-- 鑱旂郴浜� -->
             <zt-form-item label="杞欢鏍囪瘑" prop="identity" style="width: 49%" rules="required">
@@ -83,11 +83,7 @@
                 杞欢绫诲瀷
               </div>
               <div style="width: calc(100% - 120px);">
-                <el-checkbox-group v-model="dataForm.checkList">
-                  <el-checkbox :label="0">閫氱敤搴旂敤杞欢</el-checkbox>
-                  <el-checkbox :label="1">琛屼笟搴旂敤杞欢</el-checkbox>
-                  <el-checkbox :label="2">宓屽叆寮忚蒋浠�</el-checkbox>
-                </el-checkbox-group>
+                <zt-dict v-model="dataForm.softwareType" :radio="true"  dict="software_type" clearable></zt-dict>
               </div>
             </div>
           </div>
@@ -187,8 +183,8 @@
           developUnitAddress: '',
           developUnitContact: '',
           developUnitContWay: '',
-          checkList:[0,1],
-          software: '',
+          softwareType: '',
+          softwareName: '',
           code: '',
           identity: '',
           secretClass: '',
@@ -197,7 +193,7 @@
           projectLeader: '',
           projectTesters: '',
           projectReviewer: '',
-          isContract: ''
+          isContract: '',
         }
       }
     },
@@ -205,10 +201,13 @@
       // 鑾峰彇淇℃伅
       async getInfo() {
         let res = await this.$http.get(`/project/Project//${this.dataForm.id}`)
-        this.dataForm = {
-          ...this.dataForm,
-          ...res.data
+        if (res.success) {
+          this.dataForm = {
+            ...this.dataForm,
+            ...res.data
+          }
         }
+
       },
       // 琛ㄥ崟鎻愪氦
       async formSubmit() {

--
Gitblit v1.9.1