From 40eb98bcf3028ca1de391ac140f44920eddd9e8b Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期五, 17 十一月 2023 10:00:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/project/SoftwareTestOrder.vue | 75 +++++++++++++++++++++++++++++++++----
1 files changed, 67 insertions(+), 8 deletions(-)
diff --git a/web/src/views/modules/project/SoftwareTestOrder.vue b/web/src/views/modules/project/SoftwareTestOrder.vue
index df0c7bf..dfe5c57 100644
--- a/web/src/views/modules/project/SoftwareTestOrder.vue
+++ b/web/src/views/modules/project/SoftwareTestOrder.vue
@@ -28,13 +28,17 @@
<el-table v-loading="table.dataLoading" :data="table.dataList" height="100px" v-adaptive="{bottomOffset:70}"
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" 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"/>
- <zt-table-column-dict prop="articleNature" label="鐗╁搧鎬ц川" dict="article_nature"/>
- <zt-table-column-handle :table="table" edit-perm="project:update" delete-perm="project::delete"/>
+ <el-table-column prop="softwareName" width="250px" label="杞欢鍚嶇О"/>
+ <el-table-column prop="code" width="270" label="濮旀墭鍗曠紪鍙�"/>
+ <el-table-column prop="softwareIdentity" width="150px" label="椤圭洰鏍囪瘑"/>
+ <zt-table-column-dict prop="testBasis" width="150px" label="娴嬭瘯渚濇嵁" dict="test_basis"/>
+ <zt-table-column-dict prop="testStandard" min-width="420" label="娴嬭瘯鏍囧噯" dict="test_standard"/>
+ <zt-table-column-dict prop="articleNature" width="120px" label="鐗╁搧鎬ц川" dict="article_nature"/>
+ <zt-table-column-handle :table="table" width="150px" edit-perm="project:update" delete-perm="project::delete">
+ <template slot-scope="scope">
+ <zt-table-button @click="testOlderView()">棰勮</zt-table-button>
+ </template>
+ </zt-table-column-handle>
</el-table>
<!-- 寮圭獥, 鏂板 / 淇敼 -->
<add-or-update ref="addOrUpdate" @refreshDataList="table.query"/>
@@ -44,6 +48,26 @@
</ProjectSelect>
</zt-table-wraper>
+ <div v-show="isOpenDocPreviewDialog" class="preview-dialog">
+ <button @click="closePreviewDialog('doc')" class="close-button">鍏抽棴</button>
+ <div id="SoftwareTestOrder-doc" style="overflow: auto; width: 100%; height: 90%;"></div>
+ <div class="file-name">{{ docName }}</div>
+ </div>
+ <div v-show="isOpenPdfPreviewDialog" class="preview-dialog">
+ <button @click="closePreviewDialog('pdf')" class="close-button">鍏抽棴</button>
+ <iframe id="SoftwareTestOrder-pdf" src="" style="margin:0;padding:0;width:100%;height:90%;"></iframe>
+ <div class="file-name">{{ pdfName }}</div>
+ </div>
+ <div v-show="isOpenImgPreviewDialog" class="preview-dialog">
+ <button @click="closePreviewDialog('img')" class="close-button">鍏抽棴</button>
+ <img id="SoftwareTestOrder-img" src="" style="margin:0;padding:0;width:100%;height:90%;">
+ <div class="file-name">{{ imgName }}</div>
+ </div>
+ <div v-show="isOpenXlsPreviewDialog" class="preview-dialog">
+ <button @click="closePreviewDialog('xls')" class="close-button">鍏抽棴</button>
+ <div id="SoftwareTestOrder-xls" style="margin:0;padding:0;width:100%;height:90%;"></div>
+ <div class="file-name">{{ xlsName }}</div>
+ </div>
</div>
</el-card>
</template>
@@ -51,10 +75,19 @@
<script>
import AddOrUpdate from './SoftwareTestOrder-AddOrUpdate'
import ProjectSelect from "./Project-select.vue"
+import {setAccessoryFormat2} from '@/commonJS/commonFile'
export default {
data() {
return {
+ isOpenDocPreviewDialog:false,
+ isOpenPdfPreviewDialog:false,
+ isOpenImgPreviewDialog:false,
+ isOpenXlsPreviewDialog:false,
+ docName:'',
+ pdfName:'',
+ imgName:'',
+ xlsName:'',
dataForm: {
testBasis: '',
testType: '',
@@ -74,7 +107,33 @@
openAddWin(row) {
console.log(row.id, 'row.id')
this.$refs.addOrUpdate.$refs.dialog.init(null, {id: null, projectId: row.id})
- }
+ },
+ testOlderView(row){
+ return setAccessoryFormat2(row, 'SoftwareTestOrder', this)
+ },
+ closePreviewDialog(file) {
+ if (file == 'doc') {
+ this.docName = '';
+ this.isOpenDocPreviewDialog = false; // 鍏抽棴寮圭獥
+ const docElement = document.getElementById('SoftwareTestOrder-doc');
+ docElement.innerHTML = '';
+ } else if (file == 'pdf') {
+ this.pdfName = '';
+ this.isOpenPdfPreviewDialog = false;
+ let iframe = document.getElementById('SoftwareTestOrder-pdf');
+ iframe.src = '';
+ } else if (file == 'img') {
+ this.imgName = '';
+ this.isOpenImgPreviewDialog = false;
+ let img = document.getElementById('SoftwareTestOrder-img');
+ img.src = '';
+ } else if (file == 'xls') {
+ this.xlsName = '';
+ this.isOpenXlsPreviewDialog = false;
+ let excelElement = document.getElementById('SoftwareTestOrder-xls');
+ excelElement.innerHTML = '';
+ }
+ },
}
}
</script>
--
Gitblit v1.9.1