From 61e93a9bea52ae963b228fcb157d019607b0a051 Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期三, 15 十一月 2023 11:11:28 +0800
Subject: [PATCH] 项目表
---
web/src/views/modules/project/SoftwareTestOrder.vue | 6 +-
web/src/main.js | 13 +++---
web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue | 48 ++++++++++++++++++-----
web/src/views/modules/project/Project-select.vue | 4 +
4 files changed, 50 insertions(+), 21 deletions(-)
diff --git a/web/src/main.js b/web/src/main.js
index 19465e6..5ac5f6f 100644
--- a/web/src/main.js
+++ b/web/src/main.js
@@ -102,12 +102,13 @@
let minutes = ' '
let seconds = ' '
if (data != null) {
- // year = data.getFullYear()
- // months = (data.getMonth() + 1).toString().padStart(2, '0')
- // days = data.getDate()
- // hours = (data.getHours() + 1).toString().padStart(2, '0')
- // minutes = (data.getMinutes() + 1).toString().padStart(2, '0')
- // seconds = (data.getSeconds() + 1).toString().padStart(2, '0')
+ const dateObject = new Date(data);
+ year = dateObject.getFullYear()
+ months = (dateObject.getMonth() + 1).toString().padStart(2, '0')
+ days = dateObject.getDate()
+ hours = (dateObject.getHours() + 1).toString().padStart(2, '0')
+ minutes = (dateObject.getMinutes() + 1).toString().padStart(2, '0')
+ seconds = (dateObject.getSeconds() + 1).toString().padStart(2, '0')
}
return format.replace('YYYY', year).replace('MM', months).replace('DD', days).replace('hh', hours).replace('mm', minutes).replace('ss', seconds);
})
diff --git a/web/src/views/modules/project/Project-select.vue b/web/src/views/modules/project/Project-select.vue
index 9fbb5ce..25bba7c 100644
--- a/web/src/views/modules/project/Project-select.vue
+++ b/web/src/views/modules/project/Project-select.vue
@@ -70,7 +70,9 @@
methods: {
init(tableName) {
this.dataForm.tableName = tableName
- this.$refs.tableObj.query()
+ this.$nextTick(()=>{
+ this.$refs.tableObj.query()
+ })
// console.log(this.dataForm,'this.dataForm')
},
async selectedProject(row) {
diff --git a/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue b/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
index ec4c9b8..76c1ef8 100644
--- a/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
+++ b/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
@@ -106,11 +106,15 @@
@cell-click="handleCellClick"
stripe>
<el-table-column type="index" align="center" width="80" label="搴忓彿"/>
- <el-table-column prop="name" min-width="300" label="鍚嶇О"></el-table-column>
+ <el-table-column min-width="300" label="鍚嶇О">
+ <template slot-scope="scope">
+ <span>{{ (dataForm.project.softwareName||'') + scope.row.name }}</span>
+ </template>
+ </el-table-column>
<el-table-column align="center" width="180" label="鏍囪瘑/鐗堟湰">
<template slot-scope="scope">
<span v-if="editingCell && editingCell.row === scope.row && editingCell.column.property === scope.column.property">
- <el-input ref="editInput" @change="changeExpireSituation(scope.row)" v-model="scope.row.identify" placeholder="鏍囪瘑/鐗堟湰"></el-input>
+ <el-input ref="editInput" v-model="scope.row.identify" placeholder="鏍囪瘑/鐗堟湰"></el-input>
</span>
<span v-else>{{ scope.row.identify }}</span>
</template>
@@ -168,11 +172,11 @@
娴嬭瘯绫诲瀷
</div>
<div class="el-border-left" style="width: 98%">
- <el-form-item style="width: 40%;padding-left:5%;">
+ <el-form-item style="width: 40%;padding-left:5%;margin-bottom: 0">
<zt-dict-checkbox v-model="dataForm.softwareTestOrder.testType1" column="2" dict="test_type1"
clearable></zt-dict-checkbox>
</el-form-item>
- <el-form-item style="width: 60%;padding-left: 15%;border-left: 1px solid rgba(0,0,0,.2);">
+ <el-form-item style="width: 60%;padding-left: 15%;border-left: 1px solid rgba(0,0,0,.2);margin-bottom: 0">
<zt-dict-checkbox v-model="dataForm.softwareTestOrder.testType2" dict="test_type2"
clearable></zt-dict-checkbox>
</el-form-item>
@@ -350,7 +354,7 @@
<el-input v-model="dataForm.testAgencyInfo.agencyName" placeholder="璇疯緭鍏ュ崟浣嶅悕绉�"></el-input>
</el-form-item>
<!-- 鑱旂郴浜� -->
- <el-form-item class="marginTopAndMarginBottom2" label-width="130px" label="鍦板潃" style="width: 98%">
+ <el-form-item class="marginTopAndMarginBottom3" label-width="130px" label="鍦板潃" style="width: 98%">
<el-input v-model="dataForm.testAgencyInfo.site" placeholder="璇疯緭鍏ヨ仈绯讳汉"></el-input>
</el-form-item>
<!-- 璇︾粏鍦板潃 -->
@@ -420,7 +424,7 @@
</el-form>
<template v-slot:footer>
- <zt-button v-if="dataForm.disabled" type="primary">鎵撳嵃</zt-button>
+ <el-button v-if="dataForm.disabled" type="primary">鎵撳嵃</el-button>
</template>
</zt-dialog>
</template>
@@ -473,11 +477,21 @@
softwareName: '',
softwareType: '',
tenantId: '',
- testLevel: ''
+ testLevel: '',
+
+ },
+ testAgencyInfo: {
+ agencyName:'',
+ site:'',
+ businContact:'',
+ businComplaint:'',
+ laborContact:'',
+ labContactNum:'',
+ postalCode:'',
+ fax:''
},
deliverableList: [],
measuredList: [],
- testAgencyInfo: {}
}
}
},
@@ -495,6 +509,7 @@
init(id,row){
this.dataForm.id = row.id
this.dataForm.projectId = row.projectId
+ // this.dataForm.disabled
this.getInfo()
console.log(this.dataForm.id,this.dataForm.projectId,'params params')
},
@@ -504,17 +519,24 @@
orderId: this.dataForm.id,
projectId: this.dataForm.projectId
}
-
+ console.log(this.dataForm, "this.dataForm")
let res = await this.$http.get(`/project/SoftwareTestOrder/getDto`, {params: params})
if (res.data) {
this.dataForm = {
+ ...this.dataForm,
...res.data
+ }
+ if(this.dataForm.project === null){
+ this.dataForm.project={}
}
if(this.dataForm.softwareTestOrder === null){
this.dataForm.softwareTestOrder={}
}
+ if(this.dataForm.testAgencyInfo === null){
+ this.dataForm.testAgencyInfo={}
+ }
}
- console.log(this.dataForm, "this.dataForm")
+ // console.log(this.dataForm, "this.dataForm")
},
// 琛ㄥ崟鎻愪氦
@@ -538,6 +560,7 @@
.weiTuoDanAuto .el-radio {
padding: 5px;
+ margin-right: 10px;
}
.zt .weiTuoDanAuto .el-form-item.el-form-item--default {
@@ -619,7 +642,10 @@
margin-top: -10px !important;
margin-bottom: 10px !important;
}
-
+.weiTuoDanAuto .marginTopAndMarginBottom3 {
+ margin-top: 0 !important;
+ margin-bottom: 10px !important;
+}
.csjgxx > .el-form-item > .el-form-item__content {
width: calc(100% - 130px);
}
diff --git a/web/src/views/modules/project/SoftwareTestOrder.vue b/web/src/views/modules/project/SoftwareTestOrder.vue
index d8888a3..8671836 100644
--- a/web/src/views/modules/project/SoftwareTestOrder.vue
+++ b/web/src/views/modules/project/SoftwareTestOrder.vue
@@ -1,7 +1,7 @@
<template>
<el-card shadow="never" class="aui-card--fill">
<div class="mod-project-softwareTestOrder}">
- <zt-table-wraper query-url="/project/SoftwareTestOrder/page" delete-url="/project/SoftwareTestOrder"
+ <zt-table-wraper query-url="/project/SoftwareTestOrder/page" delete-url="/project/SoftwareTestOrder/deleteOrder"
v-slot="{ table }">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
<el-form-item>
@@ -29,7 +29,7 @@
border @selection-change="table.selectionChangeHandle">
<el-table-column type="selection" align="center" width="40"/>
<el-table-column prop="softwareName" label="杞欢鍚嶇О"/>
- <el-table-column prop="code" label="濮旀墭鍗曠紪鍙�"/>
+ <el-table-column prop="code" min-width="270" label="濮旀墭鍗曠紪鍙�"/>
<el-table-column prop="softwareIdentity" label="椤圭洰鏍囪瘑"/>
<zt-table-column-dict prop="testBasis" label="娴嬭瘯渚濇嵁" dict="test_basis"/>
<zt-table-column-dict prop="testStandard" width="370px" label="娴嬭瘯鏍囧噯" dict="test_standard"/>
@@ -37,7 +37,7 @@
<zt-table-column-handle :table="table" edit-perm="project:update" delete-perm="project::delete"/>
</el-table>
<!-- 寮圭獥, 鏂板 / 淇敼 -->
- <add-or-update ref="addOrUpdate" @refreshDataList="table.query"/>
+ <add-or-update ref="addOrUpdate" @refreshDataList="ctable.query"/>
<ProjectSelect ref="projectSelect"
@refreshDataList="table.query"
@setProjectInfo="openAddWin">
--
Gitblit v1.9.1