From d3435db0a892ba9b7ecd10b6a0f522b0798bf978 Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期五, 17 十一月 2023 14:27:14 +0800
Subject: [PATCH] 项目表
---
web/src/views/modules/project/Project.vue | 6 +++---
web/src/views/modules/project/SoftwareTestOrder.vue | 16 ++++++++++------
web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue | 15 +++------------
web/src/views/pages/view.vue | 3 ++-
4 files changed, 18 insertions(+), 22 deletions(-)
diff --git a/web/src/views/modules/project/Project.vue b/web/src/views/modules/project/Project.vue
index ffc4e4c..403f348 100644
--- a/web/src/views/modules/project/Project.vue
+++ b/web/src/views/modules/project/Project.vue
@@ -15,10 +15,10 @@
<zt-dict v-model="dataForm.criticalLevel" placeholder="鍏抽敭绛夌骇" dict="critical_level" clearable></zt-dict>
</el-form-item>
- <el-form-item>
- <zt-dict v-model="dataForm.testLevel" placeholder="娴嬭瘯绾у埆" dict="test_level" clearable></zt-dict>
+<!-- <el-form-item>-->
+<!-- <zt-dict v-model="dataForm.testLevel" placeholder="娴嬭瘯绾у埆" dict="test_level" clearable></zt-dict>-->
- </el-form-item>
+<!-- </el-form-item>-->
<el-form-item >
<zt-dict v-model="dataForm.softwareType" placeholder="杞欢绫诲瀷" dict="software_type" clearable></zt-dict>
diff --git a/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue b/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
index 8ea3e84..ccf1d4a 100644
--- a/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
+++ b/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
@@ -106,11 +106,7 @@
@cell-click="handleCellClick"
stripe>
<el-table-column prop="no" align="center" width="80" label="搴忓彿"/>
- <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 prop="name" min-width="300" label="鍚嶇О"/>
<el-table-column align="center" prop="identify" width="180" label="鏍囪瘑/鐗堟湰">
<template slot-scope="scope">
<span v-if="editingCell && editingCell.row === scope.row && editingCell.column.property === scope.column.property">
@@ -230,15 +226,10 @@
<div class="" style="width: 100%;">
<div class="el-flex " style="height: 40px">
<div style="width: 70%">
- <span>{{ dataForm.write }}</span>
+ <span>{{ dataForm.softwareTestOrder.write }}</span>
</div>
<div class="el-flex">
- <div style="width: 60px;text-align: center">{{ dataForm.year }}</div>
- 骞�
- <div style="width: 40px;text-align: center">{{ dataForm.month }}</div>
- 鏈�
- <div style="width: 40px;text-align: center">{{ dataForm.day }}</div>
- 鏃�
+ {{ dataForm.softwareTestOrder.deliveryDate | filterTime('YYYY骞碝M鏈圖D鏃�') }}
</div>
</div>
</div>
diff --git a/web/src/views/modules/project/SoftwareTestOrder.vue b/web/src/views/modules/project/SoftwareTestOrder.vue
index ac09575..8f912d7 100644
--- a/web/src/views/modules/project/SoftwareTestOrder.vue
+++ b/web/src/views/modules/project/SoftwareTestOrder.vue
@@ -48,9 +48,8 @@
@refreshDataList="table.query"
@setProjectInfo="openAddWin">
</ProjectSelect>
+ <ViewAccessory ref="ViewAccessory" :pageMarkerfun="SoftwareTestOrder"></ViewAccessory>
</zt-table-wraper>
- <View ref="view22" :pageMarkerfun="SoftwareTestOrder">
- </View>
</div>
</el-card>
</template>
@@ -58,11 +57,12 @@
<script>
import AddOrUpdate from './SoftwareTestOrder-AddOrUpdate'
import ProjectSelect from "./Project-select.vue"
-import View from '@/views/pages/view.vue'
+import ViewAccessory from '../../pages/view'
export default {
data() {
return {
+ SoftwareTestOrder:'SoftwareTestOrder',
dataForm: {
testBasis: '',
testType: '',
@@ -74,7 +74,7 @@
components: {
AddOrUpdate,
ProjectSelect,
- View
+ ViewAccessory
},
methods: {
add() {
@@ -85,8 +85,12 @@
this.$refs.addOrUpdate.$refs.dialog.init(null, {id: null, projectId: row.id})
},
preview(row){
- console.log(row,'preview(row)');
- this.$refs.view22.setAccessoryFormatSingle(row)
+ // let _this = this
+ console.log(row,'preview(row)')
+
+ console.log(this.$refs.ViewAccessory)
+ this.$refs.ViewAccessory.setAccessory(row)
+
}
}
}
diff --git a/web/src/views/pages/view.vue b/web/src/views/pages/view.vue
index 5900a54..bd6889c 100644
--- a/web/src/views/pages/view.vue
+++ b/web/src/views/pages/view.vue
@@ -26,6 +26,7 @@
<script>
import {setAccessoryFormatSingle} from '@/commonJS/commonFile'
export default {
+ name:'ViewAccessory',
props: {
pageMarkerfun: {
default: ''
@@ -58,7 +59,7 @@
})
},
methods: {
- setAccessoryFormatSingle(row) {
+ setAccessory(row) {
console.log(row, 'setAccessoryFormatSingle(row)');
return setAccessoryFormatSingle(row, this.pageMarkerfun, this)
},
--
Gitblit v1.9.1