From cb573b4eee7426d0d614fd59f48c1e8575738b8e Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 10 十一月 2023 12:02:27 +0800
Subject: [PATCH] Changes
---
web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue | 100 ++++++++++++++++++++++++++------------------------
modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java | 16 ++++----
2 files changed, 60 insertions(+), 56 deletions(-)
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 0a7579e..e22ab0a 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
@@ -66,22 +66,22 @@
return PageResult.ok(softwareTestOrderService.page(queryFilter));
}
- @GetMapping("{id}")
+ @GetMapping("getDto")
@ApiOperation("淇℃伅")
- public Result<SoftwareTestOrderDto> get(@PathVariable("id") Long id, @PathVariable("projectId") Long projectId) {
+ public Result<SoftwareTestOrderDto> getDto(Long orderId, Long projectId) {
SoftwareTestOrderDto data = new SoftwareTestOrderDto();
- if (id != null) {
- data.setId(id);
- SoftwareTestOrder softwareTestOrder = softwareTestOrderService.get(id);
+ if (orderId != null) {
+ data.setId(orderId);
+ SoftwareTestOrder softwareTestOrder = softwareTestOrderService.get(orderId);
data.setSoftwareTestOrder(softwareTestOrder);
if (projectId == null)
projectId = softwareTestOrder.getProjectId();
- data.setTestAgencyInfo(testAgencyInfoService.get(id));
- data.setSoftwareTestOrderDeliverableList(softwareTestOrderDeliverableService.childrenTables(id));
- data.setSoftwareTestOrderMeasuredList(softwareTestOrderMeasuredService.childrenTables(id));
+ data.setTestAgencyInfo(testAgencyInfoService.get(orderId));
+ data.setSoftwareTestOrderDeliverableList(softwareTestOrderDeliverableService.childrenTables(orderId));
+ data.setSoftwareTestOrderMeasuredList(softwareTestOrderMeasuredService.childrenTables(orderId));
} else {
data.setTestAgencyInfo(testAgencyInfoService.get(10000L));
}
diff --git a/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue b/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
index 1e5b06a..0e789fc 100644
--- a/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
+++ b/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
@@ -2,71 +2,71 @@
<zt-dialog ref="dialog" column="2" @confirm="formSubmit">
<el-form :model="dataForm" ref="dataForm" :disabled="dataForm.disabled" label-width="120px">
<zt-form-item label="杩愯鐜" prop="optEnviron" rules="required">
- <el-input v-model="dataForm.optEnviron"></el-input>
- </zt-form-item>
+ <el-input v-model="dataForm.optEnviron"></el-input>
+ </zt-form-item>
<zt-form-item label="缂栫▼璇█" prop="programLang" rules="required">
- <el-input v-model="dataForm.programLang"></el-input>
- </zt-form-item>
+ <el-input v-model="dataForm.programLang"></el-input>
+ </zt-form-item>
<zt-form-item label="娴嬭瘯渚濇嵁" prop="testBasis" rules="required">
- <zt-dict v-model="dataForm.testBasis" dict="test_basis"></zt-dict>
- </zt-form-item>
+ <zt-dict v-model="dataForm.testBasis" dict="test_basis"></zt-dict>
+ </zt-form-item>
<zt-form-item label="娴嬭瘯绫诲瀷" prop="testType" rules="required">
- <zt-dict v-model="dataForm.testType" dict="test_type1"></zt-dict>
- </zt-form-item>
+ <zt-dict v-model="dataForm.testType" dict="test_type1"></zt-dict>
+ </zt-form-item>
<zt-form-item label="娴嬭瘯鏍囧噯" prop="testStandard" rules="required">
- <zt-dict v-model="dataForm.testStandard" dict="test_standard"></zt-dict>
- </zt-form-item>
+ <zt-dict v-model="dataForm.testStandard" dict="test_standard"></zt-dict>
+ </zt-form-item>
<zt-form-item label="寮�濮嬫棩鏈�" prop="startDate" rules="required">
- <el-input v-model="dataForm.startDate"></el-input>
- </zt-form-item>
+ <el-input v-model="dataForm.startDate"></el-input>
+ </zt-form-item>
<zt-form-item label="缁撴潫鏃ユ湡" prop="endDate" rules="required">
- <el-input v-model="dataForm.endDate"></el-input>
- </zt-form-item>
+ <el-input v-model="dataForm.endDate"></el-input>
+ </zt-form-item>
<zt-form-item label="娴嬭瘯鍦哄湴" prop="testVenue" rules="required">
- <el-input v-model="dataForm.testVenue"></el-input>
- </zt-form-item>
+ <el-input v-model="dataForm.testVenue"></el-input>
+ </zt-form-item>
<zt-form-item label="鍏朵粬瑕佹眰" prop="otherRequire" rules="required">
- <el-input v-model="dataForm.otherRequire"></el-input>
- </zt-form-item>
+ <el-input v-model="dataForm.otherRequire"></el-input>
+ </zt-form-item>
<zt-form-item label="娴嬭瘯鏃ユ湡" prop="testDate" rules="required">
- <el-input v-model="dataForm.testDate"></el-input>
- </zt-form-item>
+ <el-input v-model="dataForm.testDate"></el-input>
+ </zt-form-item>
<zt-form-item label="浜や粯鏃ユ湡" prop="deliveryDate" rules="required">
- <el-input v-model="dataForm.deliveryDate"></el-input>
- </zt-form-item>
+ <el-input v-model="dataForm.deliveryDate"></el-input>
+ </zt-form-item>
<zt-form-item label="妫�娴嬭垂鐢�" prop="testCost" rules="required">
- <el-input v-model="dataForm.testCost"></el-input>
- </zt-form-item>
+ <el-input v-model="dataForm.testCost"></el-input>
+ </zt-form-item>
<zt-form-item label="鐗╁搧鎬ц川" prop="articleNature" rules="required">
- <zt-dict v-model="dataForm.articleNature" dict="article_nature"></zt-dict>
- </zt-form-item>
+ <zt-dict v-model="dataForm.articleNature" dict="article_nature"></zt-dict>
+ </zt-form-item>
<zt-form-item label="鏍峰搧鐘舵��" prop="sampleStatus" rules="required">
- <el-input v-model="dataForm.sampleStatus"></el-input>
- </zt-form-item>
+ <el-input v-model="dataForm.sampleStatus"></el-input>
+ </zt-form-item>
<zt-form-item label="娴嬭瘎鏈烘瀯鍚嶇О" prop="agencyName" rules="required">
- <el-input v-model="dataForm.agencyName"></el-input>
- </zt-form-item>
+ <el-input v-model="dataForm.agencyName"></el-input>
+ </zt-form-item>
<zt-form-item label="鍦板潃" prop="site" rules="required">
- <el-input v-model="dataForm.site"></el-input>
- </zt-form-item>
+ <el-input v-model="dataForm.site"></el-input>
+ </zt-form-item>
<zt-form-item label="涓氬姟鑱旂郴" prop="businContact" rules="required">
- <el-input v-model="dataForm.businContact"></el-input>
- </zt-form-item>
+ <el-input v-model="dataForm.businContact"></el-input>
+ </zt-form-item>
<zt-form-item label="涓氬姟鎶曡瘔" prop="businComplaint" rules="required">
- <el-input v-model="dataForm.businComplaint"></el-input>
- </zt-form-item>
+ <el-input v-model="dataForm.businComplaint"></el-input>
+ </zt-form-item>
<zt-form-item label="瀹為獙瀹よ仈绯讳汉" prop="laborContact" rules="required">
- <el-input v-model="dataForm.laborContact"></el-input>
- </zt-form-item>
+ <el-input v-model="dataForm.laborContact"></el-input>
+ </zt-form-item>
<zt-form-item label="瀹為獙瀹よ仈绯荤數璇�" prop="labContactNum" rules="required">
- <el-input v-model="dataForm.labContactNum"></el-input>
- </zt-form-item>
+ <el-input v-model="dataForm.labContactNum"></el-input>
+ </zt-form-item>
<zt-form-item label="閭斂缂栫爜" prop="postalCode" rules="required">
- <el-input v-model="dataForm.postalCode"></el-input>
- </zt-form-item>
+ <el-input v-model="dataForm.postalCode"></el-input>
+ </zt-form-item>
<zt-form-item label="浼犵湡" prop="fax" rules="required">
- <el-input v-model="dataForm.fax"></el-input>
- </zt-form-item>
+ <el-input v-model="dataForm.fax"></el-input>
+ </zt-form-item>
</el-form>
</zt-dialog>
</template>
@@ -76,20 +76,24 @@
data() {
return {
dataForm: {
- id: '',
- projectId: ''
+ id: null,
+ projectId: null
}
}
},
methods: {
// 鑾峰彇淇℃伅
async getInfo() {
- let res = await this.$http.get(`/project/SoftwareTestOrder/${this.dataForm.id}`)
+ let params = {
+ orderId: this.dataForm.id,
+ projectId: this.dataForm.projectId
+ }
+ let res = await this.$http.get(`/project/SoftwareTestOrder/getDto`, {params: params})
this.dataForm = {
...this.dataForm,
...res.data
}
- console.log(this.dataForm,"this.dataForm")
+ console.log(this.dataForm, "this.dataForm")
},
// 琛ㄥ崟鎻愪氦
async formSubmit() {
--
Gitblit v1.9.1