From 1d29540c77a0b736e10a9be0c0834c1813c3303e Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 20 十二月 2023 14:51:04 +0800
Subject: [PATCH] 修改
---
web/src/views/modules/baselineRelease/BaselineRelease-AddOrUpdate.vue | 313 +++++++++++++++++++++++++++++-----------------------
1 files changed, 175 insertions(+), 138 deletions(-)
diff --git a/web/src/views/modules/baselineRelease/BaselineRelease-AddOrUpdate.vue b/web/src/views/modules/baselineRelease/BaselineRelease-AddOrUpdate.vue
index d033107..02096b7 100644
--- a/web/src/views/modules/baselineRelease/BaselineRelease-AddOrUpdate.vue
+++ b/web/src/views/modules/baselineRelease/BaselineRelease-AddOrUpdate.vue
@@ -8,14 +8,14 @@
</el-form-item>
</div>
<div style="border: 1px solid rgba(0,0,0,.2);width: 99%">
-<!-- <div style="border-bottom: 1px solid rgba(0,0,0,.2);" class="baselineContentWidth">-->
-<!-- <el-form-item class="marginTopAndMarginBottom" label="椤圭洰鏍囪瘑" style="width: 49%">-->
-<!-- <el-input v-model="dataForm.project.softwareIdentity" placeholder="椤圭洰鏍囪瘑"></el-input>-->
-<!-- </el-form-item>-->
-<!-- <el-form-item class="marginTopAndMarginBottom" label="椤圭洰鍚嶇О" style="width: 49%">-->
-<!-- <el-input v-model="dataForm.project.softwareName" placeholder="椤圭洰鍚嶇О"></el-input>-->
-<!-- </el-form-item>-->
-<!-- </div>-->
+ <!-- <div style="border-bottom: 1px solid rgba(0,0,0,.2);" class="baselineContentWidth">-->
+ <!-- <el-form-item class="marginTopAndMarginBottom" label="椤圭洰鏍囪瘑" style="width: 49%">-->
+ <!-- <el-input v-model="dataForm.project.softwareIdentity" placeholder="椤圭洰鏍囪瘑"></el-input>-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item class="marginTopAndMarginBottom" label="椤圭洰鍚嶇О" style="width: 49%">-->
+ <!-- <el-input v-model="dataForm.project.softwareName" placeholder="椤圭洰鍚嶇О"></el-input>-->
+ <!-- </el-form-item>-->
+ <!-- </div>-->
<div class="el-flexBaselineDialog el-border-bottom">
<div style="width: 120px;text-align: center;font-weight: 600">
椤圭洰鏍囪瘑
@@ -36,48 +36,49 @@
</div>
<div style="border-bottom: 1px solid rgba(0,0,0,.2);">
<div style="width: 100%;">
- <div class="DHold" style="border-bottom: 1px solid rgba(0,0,0,.2);height: 40px;line-height: 40px">鍩虹嚎鍙戝竷鎻忚堪</div>
- <div class="el-flexBaselineDialog el-border-bottom">
- <div class="DWidth DAlign DHold">
- 鍩虹嚎绫诲瀷
- </div>
- <div class="el-border-left" style="width: calc(100% - 120px)">
- <el-form-item style="padding-left:5%;margin-bottom:0">
- <zt-dict v-model="dataForm.baseline.baselineType" placeholder="鍩虹嚎绫诲瀷" dict="baseline_type"
- :radio="true"></zt-dict>
- </el-form-item>
- </div>
+ <div class="DHold" style="border-bottom: 1px solid rgba(0,0,0,.2);height: 40px;line-height: 40px">鍩虹嚎鍙戝竷鎻忚堪
+ </div>
+ <div class="el-flexBaselineDialog el-border-bottom">
+ <div class="DWidth DAlign DHold">
+ 鍩虹嚎绫诲瀷
</div>
-<!-- <el-form-item class="marginTopAndMarginBottom" label="鍩虹嚎绫诲瀷" style="width: 49%">-->
-<!-- <zt-dict v-model="dataForm.baseline.baselineType" placeholder="鍩虹嚎绫诲瀷" dict="baseline_type"-->
-<!-- :radio="true"></zt-dict>-->
-<!-- </el-form-item>-->
- <div class="el-flexBaselineDialog el-border-bottom">
- <div class="DWidth DAlign DHold">
- 鍩虹嚎鍚嶇О
- </div>
- <div class="el-border-left acceptDate1" style="width: calc(100% - 120px)">
- <el-form-item style="width: 100%;margin-bottom:0">
- <span>{{dataForm.baseline.baselineName}}</span>
- </el-form-item>
- </div>
+ <div class="el-border-left" style="width: calc(100% - 120px)">
+ <el-form-item style="padding-left:5%;margin-bottom:0">
+ <zt-dict :disabled="stepMarker!=='jxfb_first'" v-model="dataForm.baseline.baselineType" placeholder="鍩虹嚎绫诲瀷" dict="baseline_type"
+ :radio="true"></zt-dict>
+ </el-form-item>
</div>
-<!-- <el-form-item class="marginTopAndMarginBottom" label="鍩虹嚎鍚嶇О" style="width: 49%">-->
-<!-- <el-input v-model="dataForm.baseline.baselineName" placeholder="鍩虹嚎鍚嶇О"></el-input>-->
-<!-- </el-form-item>-->
- <div class="el-flexBaselineDialog">
- <div class="DWidth DAlign DHold">
- 鍩虹嚎鐗堟湰
- </div>
- <div class="el-border-left acceptDate1" style="width: calc(100% - 120px)">
- <el-form-item style="width: 100%;margin-bottom:0">
- <el-input v-model="dataForm.baseline.baselineVersion" placeholder="鍩虹嚎鐗堟湰"></el-input>
- </el-form-item>
- </div>
+ </div>
+ <!-- <el-form-item class="marginTopAndMarginBottom" label="鍩虹嚎绫诲瀷" style="width: 49%">-->
+ <!-- <zt-dict v-model="dataForm.baseline.baselineType" placeholder="鍩虹嚎绫诲瀷" dict="baseline_type"-->
+ <!-- :radio="true"></zt-dict>-->
+ <!-- </el-form-item>-->
+ <div class="el-flexBaselineDialog el-border-bottom">
+ <div class="DWidth DAlign DHold">
+ 鍩虹嚎鍚嶇О
</div>
-<!-- <el-form-item class="marginTopAndMarginBottom" label="鍩虹嚎鐗堟湰" style="width: 49%">-->
-<!-- <el-input v-model="dataForm.baseline.baselineVersion" placeholder="鍩虹嚎鐗堟湰"></el-input>-->
-<!-- </el-form-item>-->
+ <div class="el-border-left acceptDate1" style="width: calc(100% - 120px)">
+ <el-form-item style="width: 100%;margin-bottom:0">
+ <span>{{dataForm.baseline.baselineName}}</span>
+ </el-form-item>
+ </div>
+ </div>
+ <!-- <el-form-item class="marginTopAndMarginBottom" label="鍩虹嚎鍚嶇О" style="width: 49%">-->
+ <!-- <el-input v-model="dataForm.baseline.baselineName" placeholder="鍩虹嚎鍚嶇О"></el-input>-->
+ <!-- </el-form-item>-->
+ <div class="el-flexBaselineDialog">
+ <div class="DWidth DAlign DHold">
+ 鍩虹嚎鐗堟湰
+ </div>
+ <div class="el-border-left acceptDate1" style="width: calc(100% - 120px)">
+ <el-form-item style="width: 100%;margin-bottom:0">
+ <el-input :disabled="stepMarker!=='jxfb_first'" v-model="dataForm.baseline.baselineVersion" placeholder="鍩虹嚎鐗堟湰"></el-input>
+ </el-form-item>
+ </div>
+ </div>
+ <!-- <el-form-item class="marginTopAndMarginBottom" label="鍩虹嚎鐗堟湰" style="width: 49%">-->
+ <!-- <el-input v-model="dataForm.baseline.baselineVersion" placeholder="鍩虹嚎鐗堟湰"></el-input>-->
+ <!-- </el-form-item>-->
</div>
</div>
<div class="el-flexBaselineDialog el-border-bottom">
@@ -96,18 +97,19 @@
</el-table-column>
<el-table-column prop="itemName" min-width="180" label="閰嶇疆椤瑰悕绉�">
</el-table-column>
- <el-table-column label="鎿嶄綔" width="120" align="center">
+ <el-table-column v-if="stepMarker=='jxfb_bmsp'" label="鎿嶄綔" width="120" align="center">
<template v-slot="{ row }">
- <zt-table-button size="small" v-show = "row.accessoryMap" type="primary"
+ <zt-table-button size="small" v-show="isPreview(row)" type="primary"
@click="preview(row)">棰勮
</zt-table-button>
- <zt-table-button size="small" v-show = "row.accessoryMap" type="primary"
- @click="downExcel(row)">涓嬭浇
+ <zt-table-button size="small" v-show="isDownload(row)" type="primary"
+ @click="download(row)">涓嬭浇
</zt-table-button>
</template>
</el-table-column>
</el-table>
- <div :disabled="stepMarker!=='jxfb_first'" v-if="!dataForm.disabled" class="icon-container" @click="handleCommand">
+ <div :disabled="stepMarker!=='jxfb_first'" v-if="!dataForm.disabled" class="icon-container"
+ @click="handleCommand">
<!-- 鏀剧疆鍥哄畾鐨勫浘鏍� -->
<i class="el-icon-plus"></i>
</div>
@@ -132,27 +134,28 @@
</el-form-item>
</div>
</div>
- <div class="DHold" style="border-bottom: 1px solid rgba(0,0,0,.2);height: 40px;line-height: 40px">鍩虹嚎鎵瑰噯</div>
- <div class="el-flexBaselineDialog el-border-bottom">
- <div class="DWidth DAlign DHold">
- 閮ㄩ棬鎰忚
- </div>
- <div style="width: calc(100% - 120px)" class="el-border-left">
- <el-form-item class="wt-form-item" label-width="20px" style="width: 100%;padding: 5px">
- <el-input type="textarea" :rows="2" :disabled="stepMarker!=='jxfb_bmsp'" v-model="dataForm.baseline.departOpinion"></el-input>
- </el-form-item>
- <el-form-item label-width="275px" label="绛惧瓧锛�" style="width: 45%">
- <span>{{dataForm.baseline.departSign}}</span>
- </el-form-item>
- <el-form-item label-width="240px" label="鏃ユ湡锛�" style="width: 45%">
- <span>{{dataForm.baseline.signDate}}</span>
- </el-form-item>
- </div>
+ <div class="DHold" style="border-bottom: 1px solid rgba(0,0,0,.2);height: 40px;line-height: 40px">鍩虹嚎鎵瑰噯</div>
+ <div class="el-flexBaselineDialog el-border-bottom">
+ <div class="DWidth DAlign DHold">
+ 閮ㄩ棬鎰忚
</div>
+ <div style="width: calc(100% - 120px)" class="el-border-left">
+ <el-form-item class="wt-form-item" label-width="20px" style="width: 100%;padding: 5px">
+ <el-input type="textarea" :rows="2" :disabled="stepMarker!=='jxfb_bmsp'"
+ v-model="dataForm.baseline.departOpinion"></el-input>
+ </el-form-item>
+ <el-form-item label-width="275px" label="绛惧瓧锛�" style="width: 45%">
+ <span>{{dataForm.baseline.departSign}}</span>
+ </el-form-item>
+ <el-form-item label-width="240px" label="鏃ユ湡锛�" style="width: 45%">
+ <span>{{dataForm.baseline.signDate}}</span>
+ </el-form-item>
+ </div>
+ </div>
</div>
</el-form>
<ConfigItemList ref="configItemList" @getChangeItemList="getChangeItemList"></ConfigItemList>
- <Preview ref="view" :pageMarkerfun="SoftwareTestOrder"></Preview>
+ <Preview ref="view" :pageMarkerfun="BaselineRelease"></Preview>
<template v-slot:footer>
<el-button v-if="dataForm.disabled" type="primary" @click="print()">鎵撳嵃</el-button>
</template>
@@ -171,16 +174,17 @@
export default {
data() {
return {
- ids:'',
+ BaselineRelease: 'BaselineRelease',
+ ids: '',
stepMarker: '',
+ pageName: {
+ demand: '闇�姹傚熀绾�', product: '浜у搧鍩虹嚎'
+ },
+ pageCode: '',
dataForm: {
id: '',
- pageCode: '',
- projectId:'',
- remarkList:[],
- pageName: {
- demand: '闇�姹傚熀绾�', product:'浜у搧鍩虹嚎'
- },
+ projectId: '',
+ remarkList: [],
baseline: {
code: '',
baselineType: '',
@@ -206,7 +210,7 @@
},
methods: {
init(id, row) {
- if (id) {
+ if (id) {
this.dataForm.id = id
} else {
this.dataForm.id = row.id
@@ -231,23 +235,51 @@
indexFormat(index) {
return index += 1
},
- preview(row){
- this.$refs.view.openAccessoryFormatSingle(row)
+ isPreview(row) {
+ if (row.files!=null) {
+ if (row.files.groups[0].fields[0].files[0]) {
+ let fileName = row.files.groups[0].fields[0].files[0].name
+ let suffixName = ''
+ if (fileName != null) {
+ let arr = fileName.split('.')
+ suffixName = arr[arr.length - 1].toLowerCase()
+ }
+ if (suffixName == 'pdf' || suffixName == 'doc' || suffixName == 'docx' || suffixName == 'jpg' || suffixName == 'jpeg' || suffixName == 'png' || suffixName == 'xls' || suffixName == 'xlsx') {
+ return true
+ } else {
+ return false
+ }
+ } else {
+ return false
+ }
+ }
},
- downExcel(row){
- let params = qs.stringify({
- 'token': Cookies.get('token'),
- 'projectId':row.projectId,
- 'selectId':row.selectId,
- })
- let apiURL = ``
- window.location.href = `${window.SITE_CONFIG['apiURL']}${apiURL}?${params}`
+ isDownload(row) {
+ if (row.files!=null) {
+ if (row.files.groups[0].fields[0].files[0]) {
+ return true
+ } else {
+ return false
+ }
+ }
+ },
+ preview(row) {
+ this.$refs.view.openAccessoryFormatByForm(row)
+ },
+ download(row) {
+ if (row.files!=null) {
+ if (row.files.groups[0].fields[0].files[0]) {
+ let url = row.files.groups[0].fields[0].files[0].url;
+ window.location.href = `${url}`
+ }
+ }
},
handleCommand() {
- this.$nextTick(()=>{
- this.ids = this.dataForm.remarkList.map(item=>item.selectId).join(',')
- console.log(this.ids,'handleCommand ids')
- this.$refs.configItemList.$refs.dialog.init(this.dataForm.projectId,this.ids)
+ this.$nextTick(() => {
+ this.ids = this.dataForm.remarkList.map(item => item.selectId).join(',')
+ console.log(this.ids, 'handleCommand ids')
+ console.log(this.pageCode, 'handleCommand this.pageCode')
+ this.$refs.configItemList.$refs.dialog.init(this.dataForm.projectId,{ids:this.ids,pageCode:this.pageCode})
})
},
// 鑾峰彇淇℃伅
@@ -263,14 +295,15 @@
...this.dataForm,
...res.data
}
+ this.dataForm.baseline.baselineName = this.pageName[this.pageCode]
console.log(this.dataForm, 'this.dataForm this.dataForm')
},
- getChangeItemList(data){
- console.log(data.remarkList,'getChangeItemList(data)')
- if(data.remarkList){
- this.dataForm.remarkList=this.dataForm.remarkList.concat(data.remarkList)
+ getChangeItemList(data) {
+ console.log(data.remarkList, 'getChangeItemList(data)')
+ if (data.remarkList) {
+ this.dataForm.remarkList = this.dataForm.remarkList.concat(data.remarkList)
}
- console.log(this.dataForm.remarkList,'this.dataForm.configChangeList')
+ console.log(this.dataForm.remarkList, 'this.dataForm.configChangeList')
},
async print() {
var params = qs.stringify({
@@ -278,12 +311,12 @@
id: this.dataForm.id,
pageCode: this.pageCode
})
- let apiURL = `/baselineRelease/BaselineRelease/exportbaseline`
+ let apiURL = `/baselineRelease/BaselineRelease/exportBaseline`
window.location.href = `${window.SITE_CONFIG['apiURL']}${apiURL}?${params}`
},
// 琛ㄥ崟鎻愪氦
async formSubmit(submitType) {
- if (submitType == 'tj' || submitType == 'bl' ) {
+ if (submitType == 'tj' || submitType == 'bl') {
let flowInfo = {
flowCode: 'jxfb',
stepIdMark: this.stepMarker,
@@ -303,51 +336,55 @@
}
</script>
<style>
-.el-flexBaselineDialog {
- display: flex;
- align-items: center
-}
-.DWidth{
- width: 120px;
-}
-.baselineFormAuto .acceptDate > .el-form-item > .el-form-item__content {
- width: 100%;
-}
+ .el-flexBaselineDialog {
+ display: flex;
+ align-items: center
+ }
-.baselineFormAuto .acceptDate1 > .el-form-item > .el-form-item__content {
- width: 100%;
-}
+ .DWidth {
+ width: 120px;
+ }
-.baselineFormAuto .marginTopAndMarginBottom {
- margin-top: 10px !important;
- margin-bottom: 0 !important;
-}
+ .baselineFormAuto .acceptDate > .el-form-item > .el-form-item__content {
+ width: 100%;
+ }
-.baselineFormAuto .marginTopAndMarginBottom2 {
- margin-top: -10px !important;
- margin-bottom: 10px !important;
-}
+ .baselineFormAuto .acceptDate1 > .el-form-item > .el-form-item__content {
+ width: 100%;
+ }
-.baselineFormAuto .marginTopAndMarginBottom3 {
- margin-top: 0 !important;
- margin-bottom: 10px !important;
-}
+ .baselineFormAuto .marginTopAndMarginBottom {
+ margin-top: 10px !important;
+ margin-bottom: 0 !important;
+ }
-.baselineFormAuto .acceptDate > .el-form-item > .el-form-item__content {
- line-height: 78px;
-}
+ .baselineFormAuto .marginTopAndMarginBottom2 {
+ margin-top: -10px !important;
+ margin-bottom: 10px !important;
+ }
-.baselineContentWidth > .el-form-item > .el-form-item__content {
- width: calc(100% - 120px);
-}
+ .baselineFormAuto .marginTopAndMarginBottom3 {
+ margin-top: 0 !important;
+ margin-bottom: 10px !important;
+ }
-.baselineFormAuto .el-radio {
- margin-right: 10px;
-}
-.wt-form-item .el-form-item__content{
- width: 100%;
-}
-.DHold{
- font-weight: 600;
-}
+ .baselineFormAuto .acceptDate > .el-form-item > .el-form-item__content {
+ line-height: 78px;
+ }
+
+ .baselineContentWidth > .el-form-item > .el-form-item__content {
+ width: calc(100% - 120px);
+ }
+
+ .baselineFormAuto .el-radio {
+ margin-right: 10px;
+ }
+
+ .wt-form-item .el-form-item__content {
+ width: 100%;
+ }
+
+ .DHold {
+ font-weight: 600;
+ }
</style>
--
Gitblit v1.9.1