From 33880145617845479c6e3ba9d069eb9935d8d2ce Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期二, 14 十一月 2023 16:27:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/packages/components/zt-dialog/src/zt-dialog.vue | 1 +
web/src/views/modules/project/SoftwareTestOrder.vue | 5 +++--
web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue | 2 +-
web/src/views/modules/project/Project-select.vue | 30 ++++++++++++++----------------
modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java | 2 +-
5 files changed, 20 insertions(+), 20 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 b6a7f29..d362da1 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
@@ -82,7 +82,7 @@
@GetMapping("getDto")
@ApiOperation("淇℃伅")
- public Result<SoftwareTestOrderDto> getDto(Long orderId, Long projectId) {
+ public Result<SoftwareTestOrderDto> getDto(Long projectId,Long orderId) {
SoftwareTestOrderDto data = softwareTestOrderService.getDto(orderId, projectId);
return Result.ok(data);
}
diff --git a/web/packages/components/zt-dialog/src/zt-dialog.vue b/web/packages/components/zt-dialog/src/zt-dialog.vue
index f2c28e0..092aec8 100644
--- a/web/packages/components/zt-dialog/src/zt-dialog.vue
+++ b/web/packages/components/zt-dialog/src/zt-dialog.vue
@@ -85,6 +85,7 @@
}
if (this.$parent.init) {
+ console.log(id,row,'id row')
this.$parent.init(id, row)
}
if (id && this.$parent.getInfo) {
diff --git a/web/src/views/modules/project/Project-select.vue b/web/src/views/modules/project/Project-select.vue
index 41b857f..9fbb5ce 100644
--- a/web/src/views/modules/project/Project-select.vue
+++ b/web/src/views/modules/project/Project-select.vue
@@ -2,37 +2,35 @@
<zt-dialog ref="dialog" column="2">
<el-card shadow="never" class="aui-card--fill">
<div class="mod-project-project}">
- <zt-table-wraper query-url="/project/Project/page" delete-url="/project/Project" v-slot="{ table }">
- <el-form :inline="true" class="form-input-width-1" :model="dataForm" @keyup.enter.native="table.query()">
- <el-form-item>
+ <zt-table-wraper ref="tableObj" query-url="/project/Project/page" delete-url="/project/Project" v-slot="{ table }">
+ <el-form :inline="true" style="padding: 0" :model="dataForm" @keyup.enter.native="table.query()">
+ <el-form-item style="width:12%">
<el-input v-model="dataForm.softwareName" placeholder="璇疯緭鍏ヨ蒋浠跺悕绉�" clearable></el-input>
-
</el-form-item>
- <el-form-item>
+ <el-form-item style="width:12%">
<zt-dict v-model="dataForm.secretClass" placeholder="瀵嗙骇" dict="secret_class" clearable></zt-dict>
-
</el-form-item>
- <el-form-item>
+ <el-form-item style="width:12%">
<zt-dict v-model="dataForm.criticalLevel" placeholder="鍏抽敭绛夌骇" dict="critical_level" clearable></zt-dict>
-
</el-form-item>
- <el-form-item>
+ <el-form-item style="width:12%">
<zt-dict v-model="dataForm.testLevel" placeholder="娴嬭瘯绾у埆" dict="test_level" clearable></zt-dict>
-
</el-form-item>
- <el-form-item>
+ <el-form-item style="width:12%">
<zt-dict v-model="dataForm.softwareType" placeholder="杞欢绫诲瀷" dict="software_type" clearable></zt-dict>
-
</el-form-item>
- <el-form-item>
+ <el-form-item style="width:12%">
<zt-dict v-model="dataForm.isContract" placeholder="鏄惁绛剧讲鍚堝悓" dict="is_or_not" clearable></zt-dict>
-
</el-form-item>
- <el-form-item style="float: right">
+ <el-form-item style="float: right;width:12%">
<zt-button type="query" @click="table.query()"/>
</el-form-item>
</el-form>
- <el-table v-loading="table.dataLoading" :data="table.dataList" height="100px" v-adaptive="{bottomOffset:70}"
+ <el-table v-loading="table.dataLoading"
+ :data="table.dataList"
+ height="100px"
+ v-adaptive="{bottomOffset:70}"
+ @row-dblclick="selectedProject"
border @selection-change="table.selectionChangeHandle">
<el-table-column type="selection" align="center" width="40"/>
<el-table-column prop="entrustUnitName" label="濮旀墭鍗曚綅鍚嶇О"/>
diff --git a/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue b/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
index fd76c60..8635ab8 100644
--- a/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
+++ b/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
@@ -490,7 +490,7 @@
console.log(this.editingCell, 'this.editingCell')
},
- init(data){
+ init2(data){
this.dataForm.id = null
this.dataForm.projectId = data.id
this.getInfo()
diff --git a/web/src/views/modules/project/SoftwareTestOrder.vue b/web/src/views/modules/project/SoftwareTestOrder.vue
index 87d17a3..823e5b2 100644
--- a/web/src/views/modules/project/SoftwareTestOrder.vue
+++ b/web/src/views/modules/project/SoftwareTestOrder.vue
@@ -17,7 +17,7 @@
</el-form-item>
<el-form-item>
<zt-button type="query" @click="table.query()"/>
- <zt-button type="add" perm="project:add" @click="table.editHandle()"/>
+<!-- <zt-button type="add" perm="project:add" @click="table.editHandle()"/>-->
<zt-button type="primary" class="el-icon-edit" perm="project:add" @click="add()">鏂板</zt-button>
<zt-button type="delete" perm="project:delete" @click="table.deleteHandle()"/>
</el-form-item>
@@ -67,7 +67,8 @@
this.$refs.projectSelect.$refs.dialog.init("software_test_order")
},
openAddWin(row){
- this.$refs.addOrUpdate.$refs.dialog.init(row)
+ console.log(row.id,'row.id')
+ this.$refs.addOrUpdate.$refs.dialog.init(row.id,row)
}
}
}
--
Gitblit v1.9.1