From 7416356c7658db835e3e47dbb93f49b7e0cd762b Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 05 十二月 2023 17:30:11 +0800
Subject: [PATCH] 6
---
modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/ConfigItemWarehouse.java | 3
modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseCmAuditDao.xml | 2
modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseQaAuditDao.xml | 2
web/src/views/layout/main-sidebar-sub-menu.vue | 3
modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/dao/TestCheckOrderListDao.java | 2
modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/controller/TestCheckOrderController.java | 33 +++++-----
/dev/null | 23 -------
web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue | 44 ++++++--------
modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/WarehouseConfigItem.java | 6 ++
modules/mainPart/src/main/resources/mapper/testCheckOrder/TestCheckOrderListDao.xml | 2
modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/service/TestCheckOrderListService.java | 4
modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/dto/CheckOrderDto.java | 2
web/src/views/modules/testCheckOrder/TestCheckOrder.vue | 12 +--
modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/service/TestCheckOrderService.java | 14 +---
modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml | 2
15 files changed, 61 insertions(+), 93 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/ConfigItemWarehouse.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/ConfigItemWarehouse.java
index 88e68dd..9a3896f 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/ConfigItemWarehouse.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/ConfigItemWarehouse.java
@@ -26,8 +26,7 @@
@ApiModelProperty(value = "椤圭洰ID")
private Long projectId;
- @ApiModelProperty(value = "妫�鏌ュ崟ID")
- private Long checkId;
+
@ApiModelProperty(value = "閰嶇疆椤瑰叆搴撶紪鍙�")
private String code;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/WarehouseConfigItem.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/WarehouseConfigItem.java
index 1985365..c462154 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/WarehouseConfigItem.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/WarehouseConfigItem.java
@@ -26,9 +26,15 @@
@ApiModelProperty(value = "鍏ュ簱ID")
private Long warehouseId;
+ @ApiModelProperty(value = "妫�鏌ュ崟ID")
+ private Long checkId;
+
@ApiModelProperty(value = "搴忓彿")
private Integer no;
+ @ApiModelProperty(value = "鍏ュ簱鐘舵��")
+ private Integer status;
+
@ApiModelProperty(value = "閰嶇疆椤瑰悕绉�")
private String itemName;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/controller/TestCheckOrderController.java b/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/controller/TestCheckOrderController.java
index f643f0d..813adb9 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/controller/TestCheckOrderController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/controller/TestCheckOrderController.java
@@ -36,12 +36,12 @@
/**
* test_check_order
*
- * @author zt generator
+ * @author zt generator
* @since 1.0.0 2023-12-05
*/
@RestController
@RequestMapping("/testCheckOrder/TestCheckOrder/")
-@Api(tags="test_check_order")
+@Api(tags = "test_check_order")
public class TestCheckOrderController {
@Autowired
private TestCheckOrderService testCheckOrderService;
@@ -52,32 +52,33 @@
@GetMapping("page")
@ApiOperation("鍒嗛〉")
@ApiImplicitParams({
- @ApiImplicitParam(name = Constant.Q.PAGE, value = Constant.QV.PAGE, required = true, dataType = Constant.QT.INT),
- @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 = "code", value = "缂栧彿", dataType = Constant.QT.STRING, format = "code^LK"), @ApiImplicitParam(name = "softwareidentity", value = "椤圭洰鏍囪瘑", dataType = Constant.QT.STRING, format = "softwareIdentity^LK"), @ApiImplicitParam(name = "softwarename", value = "椤圭洰鍚嶇О", dataType = Constant.QT.STRING, format = "softwareName^LK") })
- public PageResult<TestCheckOrder> page(@ApiIgnore @QueryParam QueryFilter queryFilter){
-
+ @ApiImplicitParam(name = Constant.Q.PAGE, value = Constant.QV.PAGE, required = true, dataType = Constant.QT.INT),
+ @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 = "code", value = "缂栧彿", dataType = Constant.QT.STRING, format = "code^LK"),
+ @ApiImplicitParam(name = "softwareidentity", value = "椤圭洰鏍囪瘑", dataType = Constant.QT.STRING, format = "softwareIdentity^LK"), @ApiImplicitParam(name = "softwarename", value = "椤圭洰鍚嶇О", dataType = Constant.QT.STRING, format = "softwareName^LK")})
+ public PageResult<TestCheckOrder> page(@ApiIgnore @QueryParam QueryFilter queryFilter) {
return PageResult.ok(testCheckOrderService.page(queryFilter));
}
@GetMapping("getDto")
@ApiOperation("淇℃伅")
- public Result<CheckOrderDto> getDto(Long checkId, Long projectId,String itemType) {
- CheckOrderDto data = testCheckOrderService.getDto(checkId, projectId,itemType);
+ public Result<CheckOrderDto> getDto(Long checkId, Long projectId, String pageCode) {
+ CheckOrderDto data = testCheckOrderService.getDto(checkId, projectId, pageCode);
return Result.ok(data);
}
@PostMapping
@ApiOperation("鏂板")
@LogOperation("鏂板")
- public Result insert(@RequestBody CheckOrderDto checkOrderDto){
+ public Result insert(@RequestBody CheckOrderDto checkOrderDto) {
//鏁堥獙鏁版嵁
ValidatorUtils.validateEntity(checkOrderDto, AddGroup.class, DefaultGroup.class);
Map<String, String> map = new HashMap<>();
- map.put("funCode", "test_check_order");
- map.put("projectId",checkOrderDto.getProjectId().toString());
+ String pagecode = checkOrderDto.getPageCode();
+ map.put("funCode", "test_check_order"+pagecode);
+ map.put("projectId", checkOrderDto.getProjectId().toString());
checkOrderDto.getCheckOrder().setCode(sysCodeRuleService.getNewCode(map));
Boolean result = testCheckOrderService.save(checkOrderDto);
return Result.ok();
@@ -86,7 +87,7 @@
@PutMapping
@ApiOperation("淇敼")
@LogOperation("淇敼")
- public Result update(@RequestBody CheckOrderDto checkOrderDto){
+ public Result update(@RequestBody CheckOrderDto checkOrderDto) {
//鏁堥獙鏁版嵁
ValidatorUtils.validateEntity(checkOrderDto, UpdateGroup.class, DefaultGroup.class);
Boolean result = testCheckOrderService.save(checkOrderDto);
@@ -97,7 +98,7 @@
@DeleteMapping("deleteCheckOrder")
@ApiOperation("鍒犻櫎")
@LogOperation("鍒犻櫎")
- public Result delete(@RequestBody Long[] ids){
+ public Result delete(@RequestBody Long[] ids) {
//鏁堥獙鏁版嵁
AssertUtils.isArrayEmpty(ids, "id");
testCheckOrderService.delete(ids);
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/dao/TestCheckOrderListDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/dao/TestCheckOrderListDao.java
index 17c4a13..5b8f71f 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/dao/TestCheckOrderListDao.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/dao/TestCheckOrderListDao.java
@@ -20,5 +20,5 @@
List<TestCheckOrderList> getList(Map<String, Object> params);
- List<TestCheckOrderList> itemList(String dictType);
+ List<TestCheckOrderList> itemList(String pageCode);
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/dto/CheckOrderDto.java b/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/dto/CheckOrderDto.java
index 2a94346..49be760 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/dto/CheckOrderDto.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/dto/CheckOrderDto.java
@@ -18,7 +18,7 @@
private Long checkId;//妫�鏌ュ崟ID
private Long configOrderId;//鍏ュ簱鍗旾D
private Long configItemId;//閰嶇疆椤笽D
- private String configItemType;//閰嶇疆椤圭被鍨�
+ private String pageCode;//閰嶇疆椤圭被鍨�
@ApiModelProperty(value = "娴嬭瘯椤圭洰鍩烘湰淇℃伅")
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/service/TestCheckOrderListService.java b/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/service/TestCheckOrderListService.java
index 8fc424c..317ab2e 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/service/TestCheckOrderListService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/service/TestCheckOrderListService.java
@@ -46,7 +46,7 @@
return baseDao.getList(params);
}
- public List<TestCheckOrderList> itemList(String dictType) {
- return baseDao.itemList(dictType);
+ public List<TestCheckOrderList> itemList(String pageCode) {
+ return baseDao.itemList(pageCode);
}
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/service/TestCheckOrderService.java b/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/service/TestCheckOrderService.java
index dd376c7..3f0dff6 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/service/TestCheckOrderService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/service/TestCheckOrderService.java
@@ -65,8 +65,9 @@
}
- public CheckOrderDto getDto(Long checkId, Long projectId,String itemType) {
+ public CheckOrderDto getDto(Long checkId, Long projectId,String pageCode) {
CheckOrderDto data = new CheckOrderDto();
+ data.setPageCode(pageCode);
if (checkId != null) {
data.setId(checkId);
TestCheckOrder checkOrder = this.get(checkId);
@@ -81,16 +82,7 @@
} else {
TestCheckOrder checkOrder = new TestCheckOrder();
data.setCheckOrder(checkOrder);
- List<TestCheckOrderList> checkOrderList =new ArrayList();
- if (itemType.equals("plan")){
- checkOrderList = checkOrderListService.itemList("plan_check_item");
- }else if (itemType.equals("explain")){
- checkOrderList = checkOrderListService.itemList("explain_check_item");
- }else if(itemType.equals("record")){
- checkOrderList = checkOrderListService.itemList("record_check_item");
- }else if (itemType.equals("report")){
- checkOrderList = checkOrderListService.itemList("report_check_item");
- }
+ List<TestCheckOrderList> checkOrderList = checkOrderListService.itemList(pageCode+"_check_item");
data.setCheckOrderList(checkOrderList);
}
if (projectId != null) {
diff --git a/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseCmAuditDao.xml b/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseCmAuditDao.xml
index 4b0dc7e..d1667fb 100644
--- a/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseCmAuditDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseCmAuditDao.xml
@@ -5,7 +5,7 @@
<select id="getList" resultType="com.zt.life.modules.configItemWarehouse.model.WarehouseCmAudit">
select a.*
- from warehouse_cm_audit a
+ from config_item_warehouse_cm a
<where>
a.is_delete = 0
<if test="warehouseId!=null">
diff --git a/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml b/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml
index fb58609..948c71c 100644
--- a/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml
@@ -5,7 +5,7 @@
<select id="getList" resultType="com.zt.life.modules.configItemWarehouse.model.WarehouseConfigItem">
select a.*
- from warehouse_config_item a
+ from config_item_warehouse_detail a
<where>
a.is_delete = 0
<if test="warehouseId!=null">
diff --git a/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseQaAuditDao.xml b/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseQaAuditDao.xml
index 1884ee2..ab67944 100644
--- a/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseQaAuditDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseQaAuditDao.xml
@@ -5,7 +5,7 @@
<select id="getList" resultType="com.zt.life.modules.configItemWarehouse.model.WarehouseQaAudit">
select a.*
- from warehouse_qa_audit a
+ from config_item_warehouse_qa a
<where>
a.is_delete = 0
<if test="warehouseId!=null">
diff --git a/modules/mainPart/src/main/resources/mapper/testCheckOrder/TestCheckOrderListDao.xml b/modules/mainPart/src/main/resources/mapper/testCheckOrder/TestCheckOrderListDao.xml
index a2e4096..7d08e68 100644
--- a/modules/mainPart/src/main/resources/mapper/testCheckOrder/TestCheckOrderListDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/testCheckOrder/TestCheckOrderListDao.xml
@@ -25,7 +25,7 @@
<where>
dd.IS_DELETE = 0
<if test="dictType != null and dictType != ''">
- and dt.DICT_TYPE = #{dictType}
+ and dt.DICT_TYPE = #{pageCode}
</if>
</where>
ORDER BY dd.sort
diff --git a/web/src/views/layout/main-sidebar-sub-menu.vue b/web/src/views/layout/main-sidebar-sub-menu.vue
index 555753e..e36c5f5 100644
--- a/web/src/views/layout/main-sidebar-sub-menu.vue
+++ b/web/src/views/layout/main-sidebar-sub-menu.vue
@@ -70,7 +70,8 @@
}
console.log(route.meta.params, 'params: route.meta.params')
this.$nextTick(() => {
- this.$router.push({name: route.name, params: route.meta.params})
+ console.log(route.meta.params,"route.meta.params")
+ this.$router.push({name: route.name, query: route.meta.params, params: route.meta.params})
})
}
}
diff --git a/web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue b/web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue
index 299b3d8..b4aa87c 100644
--- a/web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue
+++ b/web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue
@@ -10,16 +10,16 @@
<div style="border: 1px solid rgba(0,0,0,.2);width: 99%">
<div style="border-bottom: 1px solid rgba(0,0,0,.2);" class="testCheckContentWidth">
<el-form-item class="marginTopAndMarginBottom" label="椤圭洰鏍囪瘑" style="width: 49%">
- <el-input v-model="dataForm.project.softwareName" placeholder="椤圭洰鏍囪瘑"></el-input>
+ <el-input v-model="dataForm.project.softwareIdentity" placeholder="椤圭洰鏍囪瘑"></el-input>
</el-form-item>
<el-form-item class="marginTopAndMarginBottom" label="椤圭洰鍚嶇О" style="width: 49%">
- <el-input v-model="dataForm.project.softwareIdentity" placeholder="椤圭洰鍚嶇О"></el-input>
+ <el-input v-model="dataForm.project.softwareName" placeholder="椤圭洰鍚嶇О"></el-input>
</el-form-item>
<el-form-item class="marginTopAndMarginBottom3" label="妫�鏌ヤ汉" style="width: 49%">
- <el-input v-model="dataForm.project.softwareIdentity" placeholder="妫�鏌ヤ汉"></el-input>
+ <el-input v-model="dataForm.testCheckOrder.examiner" placeholder="妫�鏌ヤ汉"></el-input>
</el-form-item>
<el-form-item class="marginTopAndMarginBottom3" label="妫�鏌ユ椂闂�" style="width: 49%">
- <el-input v-model="dataForm.project.isContract" placeholder="妫�鏌ユ椂闂�"></el-input>
+ <el-input v-model="dataForm.testCheckOrder.examDate" placeholder="妫�鏌ユ椂闂�"></el-input>
</el-form-item>
</div>
<div style="border-bottom: 1px solid rgba(0,0,0,.2);">
@@ -27,21 +27,21 @@
<div style="padding: 5px">娴嬭瘯璁″垝锛�</div>
<div class="table-container">
<el-table ref="tableCirculatOrderList" class="el-software el-margin-top-bot" border
- :data="dataForm.technicalList"
+ :data="dataForm.checkOrderList"
stripe>
<el-table-column prop="no" align="center" width="60" label="搴忓彿">
<template slot-scope="scope">
<span v-html="indexFormat(scope.$index)"></span>
</template>
</el-table-column>
- <el-table-column prop="infoName" min-width="180" label="涓昏妫�鏌ュ唴瀹�">
+ <el-table-column prop="checkContent" min-width="180" label="涓昏妫�鏌ュ唴瀹�">
<template v-slot="{ row }">
- <el-input v-model="row.name" placeholder="涓昏妫�鏌ュ唴瀹�"></el-input>
+ <el-input v-model="row.checkContent" placeholder="涓昏妫�鏌ュ唴瀹�"></el-input>
</template>
</el-table-column>
- <el-table-column prop="identify" align="center" width="150" label="妫�鏌ョ粨鏋�">
+ <el-table-column prop="checkResult" align="center" width="150" label="妫�鏌ョ粨鏋�">
<template v-slot="{ row }">
- <zt-dict v-model="row.identify" dict="is_or_not" :radio="true"></zt-dict>
+ <zt-dict v-model="row.checkResult" dict="is_or_not" :radio="true"></zt-dict>
</template>
</el-table-column>
<el-table-column prop="remark" label="澶囨敞" width="100" align="center">
@@ -71,7 +71,7 @@
<div class="el-border-left acceptDate" style="height: 80px;width: 80%;">
<el-form-item style="width: 100%;padding-left:20px;margin:0;">
<el-input type="textarea"
- :rows="3" v-model="dataForm.testCheckOrder.itemOther" placeholder="闂鎻忚堪..."></el-input>
+ :rows="3" v-model="dataForm.testCheckOrder.problemDescription" placeholder="闂鎻忚堪..."></el-input>
</el-form-item>
</div>
</div>
@@ -82,7 +82,7 @@
<div class="el-border-left acceptDate" style="height: 80px;width: 80%;">
<el-form-item style="width: 100%;padding-left:20px;margin:0;">
<el-input type="textarea"
- :rows="3" v-model="dataForm.testCheckOrder.itemOther" placeholder="闂澶勭悊..."></el-input>
+ :rows="3" v-model="dataForm.testCheckOrder.problemProcess" placeholder="闂澶勭悊..."></el-input>
</el-form-item>
</div>
</div>
@@ -92,7 +92,7 @@
</div>
<div class="el-border-left-right acceptDate1" style="width: 40%;height: 40px;">
<el-form-item style="width: 100%;padding-left:20px;margin:0;">
- <el-input v-model="dataForm.testCheckOrder.itemOther" placeholder="澶勭悊浜�"></el-input>
+ <el-input v-model="dataForm.testCheckOrder.processor" placeholder="澶勭悊浜�"></el-input>
</el-form-item>
</div>
<div style="width: 84px;text-align: center;font-weight: 600">
@@ -100,7 +100,7 @@
</div>
<div class="el-border-left acceptDate1" style="width: 40%;height: 40px;">
<el-form-item label-width="150px" style="width: 100%;padding-left:20px;margin-bottom:0">
- <el-input v-model="dataForm.testCheckOrder.itemOther" placeholder="楠岃瘉浜�"></el-input>
+ <el-input v-model="dataForm.testCheckOrder.verifier" placeholder="楠岃瘉浜�"></el-input>
</el-form-item>
</div>
</div>
@@ -128,8 +128,6 @@
project:{
softwareIdentity:'',
softwareName:'',
- softwareType:'',
- isContract:'',
},
testCheckOrder:{
code: '',
@@ -138,16 +136,9 @@
problemDescription: '',
problemProcess: '',
processor: '',
- processorId: '',
- processDate: '',
verifier: '',
- verifierId: '',
- verifyDate: '',
- year: ''
},
- testAgencyInfo:{
- agencyName:''
- }
+ checkOrderList:{}
}
}
},
@@ -169,7 +160,12 @@
},
// 鑾峰彇淇℃伅
async getInfo() {
- let res = await this.$http.get(`/testCheckOrder/TestCheckOrder/${this.dataForm.id}`)
+ let params = {
+ checkId: this.dataForm.id,
+ projectId: this.dataForm.projectId,
+ pageCode:this.pageCode
+ }
+ let res = await this.$http.get(`/testCheckOrder/TestCheckOrder/getDto`, {params: params})
this.dataForm = {
...this.dataForm,
...res.data
diff --git a/web/src/views/modules/testCheckOrder/TestCheckOrder.vue b/web/src/views/modules/testCheckOrder/TestCheckOrder.vue
index 3f35ac5..54fef50 100644
--- a/web/src/views/modules/testCheckOrder/TestCheckOrder.vue
+++ b/web/src/views/modules/testCheckOrder/TestCheckOrder.vue
@@ -40,17 +40,10 @@
import Preview from '@/views/pages/view'
export default {
props: {
- pageCode: {
- type: String,
- default: ''
- },
- pageRead: {
- type: String,
- default: 'yes'
- }
},
data() {
return {
+ pageCode : '',
dataForm: {
code: '',
softwareidentity: '',
@@ -58,6 +51,9 @@
}
}
},
+ mounted() {
+ this.pageCode = this.$route.query.pageCode
+ },
components: {
AddOrUpdate,
ProjectSelect,
diff --git a/web/src/views/modules/testCheckOrder/TestExplainCheckOrder.vue b/web/src/views/modules/testCheckOrder/TestExplainCheckOrder.vue
deleted file mode 100644
index 76fc0f2..0000000
--- a/web/src/views/modules/testCheckOrder/TestExplainCheckOrder.vue
+++ /dev/null
@@ -1,22 +0,0 @@
-<template>
- <test-check-order ref="projectListObj" :pageCode="pageCode" :pageRead="pageRead"/>
-</template>
-
-<script>
- import TestCheckOrder from './TestCheckOrder'
-
- export default {
- data() {
- return {
- pageCode: 'explain',
- pageRead: 'no',
- }
- },
- components: {
- TestCheckOrder,
- },
- mounted() {
- },
- methods: {}
- }
-</script>
diff --git a/web/src/views/modules/testCheckOrder/TestPlanCheckOrder.vue b/web/src/views/modules/testCheckOrder/TestPlanCheckOrder.vue
deleted file mode 100644
index ea39f9e..0000000
--- a/web/src/views/modules/testCheckOrder/TestPlanCheckOrder.vue
+++ /dev/null
@@ -1,22 +0,0 @@
-<template>
- <test-check-order ref="projectListObj" :pageCode="pageCode" :pageRead="pageRead"/>
-</template>
-
-<script>
- import TestCheckOrder from './TestCheckOrder'
-
- export default {
- data() {
- return {
- pageCode: 'plan',
- pageRead: 'no'
- }
- },
- components: {
- TestCheckOrder,
- },
- mounted() {
- },
- methods: {}
- }
-</script>
diff --git a/web/src/views/modules/testCheckOrder/TestRecordCheckOrder.vue b/web/src/views/modules/testCheckOrder/TestRecordCheckOrder.vue
deleted file mode 100644
index 14e8e82..0000000
--- a/web/src/views/modules/testCheckOrder/TestRecordCheckOrder.vue
+++ /dev/null
@@ -1,22 +0,0 @@
-<template>
- <test-check-order ref="projectListObj" :pageCode="pageCode" :pageRead="pageRead" />
-</template>
-
-<script>
- import TestCheckOrder from './TestCheckOrder'
-
- export default {
- data() {
- return {
- pageCode: 'record',
- pageRead: 'no'
- }
- },
- components: {
- TestCheckOrder,
- },
- mounted() {
- },
- methods: {}
- }
-</script>
diff --git a/web/src/views/modules/testCheckOrder/TestReportCheckOrder.vue b/web/src/views/modules/testCheckOrder/TestReportCheckOrder.vue
deleted file mode 100644
index 5cba2b8..0000000
--- a/web/src/views/modules/testCheckOrder/TestReportCheckOrder.vue
+++ /dev/null
@@ -1,23 +0,0 @@
-<template>
- <test-check-order ref="projectListObj" :pageCode="pageCode" :pageRead="pageRead"/>
-</template>
-
-<script>
- import TestCheckOrder from './TestCheckOrder'
-
- export default {
- data() {
- return {
- pageCode: 'report',
- pageRead: 'no',
- isShow:'',
- }
- },
- components: {
- TestCheckOrder,
- },
- mounted() {
- },
- methods: {}
- }
-</script>
--
Gitblit v1.9.1