From d242e5472638bb89b48c492514f5fec4df876464 Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期二, 19 十二月 2023 09:14:25 +0800
Subject: [PATCH] 合同评审及基线表
---
web/src/views/modules/contractReview/ContractReview.vue | 4
web/src/views/modules/baselineRelease/BaselineRelease-AddOrUpdate.vue | 176 ++++++++++++++++++++++++++++++++++----------
web/src/views/modules/contractReview/ContractReview-AddOrUpdate.vue | 20 ++--
3 files changed, 148 insertions(+), 52 deletions(-)
diff --git a/web/src/views/modules/baselineRelease/BaselineRelease-AddOrUpdate.vue b/web/src/views/modules/baselineRelease/BaselineRelease-AddOrUpdate.vue
index 56a3d61..d9357e4 100644
--- a/web/src/views/modules/baselineRelease/BaselineRelease-AddOrUpdate.vue
+++ b/web/src/views/modules/baselineRelease/BaselineRelease-AddOrUpdate.vue
@@ -1,43 +1,90 @@
<template>
<zt-dialog ref="dialog" column="2" @confirm="formSubmit" :stepMarker="stepMarker" :append-to-body="true">
<el-form :model="dataForm" :inline="true" ref="dataForm" style="padding-top: 0" :disabled="dataForm.disabled"
- label-width="120px" class="testCheckFormAuto">
+ label-width="120px" class="baselineFormAuto">
<div>
<el-form-item label-width="60px" label="缂栧彿:" style="width:100%;margin-bottom: -5px">
<span>{{ dataForm.baseline.code || '缂栧彿鑷姩鐢熸垚' }}</span>
</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="testCheckContentWidth">
- <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 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">
+ 椤圭洰鏍囪瘑
+ </div>
+ <div class="el-border-left-right acceptDate1" style="width: 38%;height: 40px;">
+ <el-form-item style="width: 100%;padding: 0 5px;margin:0;">
+ <el-input v-model="dataForm.project.softwareIdentity" placeholder="椤圭洰鏍囪瘑"></el-input>
+ </el-form-item>
+ </div>
+ <div style="width: 120px;text-align: center;font-weight: 600">
+ 椤圭洰鍚嶇О
+ </div>
+ <div class="el-border-left acceptDate1" style="width: 38%;height: 40px;">
+ <el-form-item style="width: 100%;padding: 0 5px;margin:0;">
+ <el-input v-model="dataForm.project.softwareName" placeholder="椤圭洰鍚嶇О"></el-input>
+ </el-form-item>
+ </div>
</div>
<div style="border-bottom: 1px solid rgba(0,0,0,.2);">
- <div style="padding-left:5px;padding-right:5px;">
- <div style="width: 112px;text-align: center;font-weight: 600">鍩虹嚎鍙戝竷鎻忚堪</div>
- <div class="table-container">
- <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>
- <el-form-item class="marginTopAndMarginBottom" label="鍩虹嚎鍚嶇О" style="width: 49%">
- <el-input v-model="dataForm.baseline.baselineName" placeholder="鍩虹嚎鍚嶇О"></el-input>
- </el-form-item>
- <el-form-item class="marginTopAndMarginBottom" label="鍩虹嚎鐗堟湰" style="width: 49%">
- <el-input v-model="dataForm.baseline.baselineVersion" placeholder="鍩虹嚎鐗堟湰"></el-input>
- </el-form-item>
- </div>
+ <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>
+<!-- <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">
+ <el-input v-model="dataForm.baseline.baselineName" placeholder="鍩虹嚎鍚嶇О"></el-input>
+ </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 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-flexCirculationDialog el-border-bottom">
- <div style="width: 112px;text-align: center;font-weight: 600">
+ <div class="el-flexBaselineDialog el-border-bottom">
+ <div style="width: 120px;text-align: center;font-weight: 600">
澶囨敞
</div>
- <div class="el-border-left acceptDate" style="height: 80px;width: 80%;">
+ <div class="el-border-left acceptDate" style="width: calc(100% - 120px);">
<div class="table-container">
<el-table ref="tableCirculatOrderList" class="el-software el-margin-top-bot" border
:data="dataForm.remarkList"
@@ -57,43 +104,41 @@
</div>
</div>
</div>
- <div class="el-flexCirculationDialog">
- <div style="width: 112px;text-align: center;font-weight: 600">
+ <div class="el-flexBaselineDialog el-border-bottom">
+ <div style="width: 120px;text-align: center;font-weight: 600">
鍙戝竷浜�
</div>
- <div class="el-border-left-right acceptDate1" style="width: 40%;height: 40px;">
+ <div class="el-border-left-right acceptDate1" style="width: 38%;height: 40px;">
<el-form-item style="width: 100%;padding-left:20px;margin:0;">
<span>{{ dataForm.baseline.publisher}}</span>
</el-form-item>
</div>
- <div style="width: 112px;text-align: center;font-weight: 600">
+ <div style="width: 120px;text-align: center;font-weight: 600">
鍙戝竷鏃堕棿
</div>
- <div class="el-border-left-right acceptDate1" style="width: 40%;height: 40px;">
+ <div class="el-border-left acceptDate1" style="width: 38%;height: 40px;">
<el-form-item style="width: 100%;padding-left:20px;margin:0;">
<span>{{ dataForm.baseline.publishDate}}</span>
</el-form-item>
</div>
- <div style="width: 84px;text-align: center;font-weight: 600">
- 鍩虹嚎鎵瑰噯
- </div>
- <div class="el-configChangeDialog el-border-bottom">
- <div class="DFormWidth DAlign DHold">
+ </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="el-wt-form-item-margin" label-width="20px" style="width: 85%">
- <el-input :disabled="stepMarker!=='pzxbg_bmsh'" v-model="dataForm.baseline.departOpinion"></el-input>
+ <el-form-item class="wt-form-item" label-width="20px" style="width: 100%;padding: 5px">
+ <el-input type="textarea" :rows="2" :disabled="stepMarker!=='pzxbg_bmsh'" v-model="dataForm.baseline.departOpinion"></el-input>
</el-form-item>
- <el-form-item label-width="80%" label="绛惧瓧锛�" style="width: 65%">
+ <el-form-item label-width="275px" label="绛惧瓧锛�" style="width: 45%">
<span>{{dataForm.baseline.departSign}}</span>
</el-form-item>
- <el-form-item label="鏃ユ湡锛�" style="width: 20%">
+ <el-form-item label-width="240px" label="鏃ユ湡锛�" style="width: 45%">
<span>{{dataForm.baseline.signDate}}</span>
</el-form-item>
</div>
</div>
- </div>
</div>
</el-form>
<ConfigItemList ref="configItemList" @getChangeItemList="getChangeItemList"></ConfigItemList>
@@ -117,7 +162,9 @@
dataForm: {
id: '',
pageCode: '',
+ projectId:'',
stepMarker: '',
+ configChangeList:[],
pageName: {
demand: '闇�姹傚熀绾�', product:'浜у搧鍩虹嚎'
},
@@ -231,3 +278,52 @@
}
}
</script>
+<style>
+.el-flexBaselineDialog {
+ display: flex;
+ align-items: center
+}
+.DWidth{
+ width: 120px;
+}
+.baselineFormAuto .acceptDate > .el-form-item > .el-form-item__content {
+ width: 100%;
+}
+
+.baselineFormAuto .acceptDate1 > .el-form-item > .el-form-item__content {
+ width: 100%;
+}
+
+.baselineFormAuto .marginTopAndMarginBottom {
+ margin-top: 10px !important;
+ margin-bottom: 0 !important;
+}
+
+.baselineFormAuto .marginTopAndMarginBottom2 {
+ margin-top: -10px !important;
+ margin-bottom: 10px !important;
+}
+
+.baselineFormAuto .marginTopAndMarginBottom3 {
+ margin-top: 0 !important;
+ margin-bottom: 10px !important;
+}
+
+.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>
diff --git a/web/src/views/modules/contractReview/ContractReview-AddOrUpdate.vue b/web/src/views/modules/contractReview/ContractReview-AddOrUpdate.vue
index 1d384e1..067bf5d 100644
--- a/web/src/views/modules/contractReview/ContractReview-AddOrUpdate.vue
+++ b/web/src/views/modules/contractReview/ContractReview-AddOrUpdate.vue
@@ -22,7 +22,7 @@
<span>{{ dataForm.contractReview.orderCode }}</span>
</el-form-item>
</div>
- <div class="el-flexManageDialog el-border-bottom">
+ <div class="el-flexContractDialog el-border-bottom">
<div class="DFormWidth DAlign DHold">
璇勫椤圭洰
</div>
@@ -31,17 +31,17 @@
<el-table ref="tableConfigItemList" class="el-software el-margin-top-bot"
style="width: 99%;margin-left: 5px" border :data="dataForm.reviewItemList"
stripe>
- <el-table-column prop="no" align="center" width="60" >
+ <el-table-column prop="no" align="center" width="60" label="搴忓彿">
<template slot-scope="scope">
<span v-html="indexFormat(scope.$index)"></span>
</template>
</el-table-column>
- <el-table-column prop="item" min-width="400" >
+ <el-table-column prop="item" min-width="400" label="璇勫椤�">
<template v-slot="{ row }">
<el-input v-model="row.item" placeholder="璇勫椤�"></el-input>
</template>
</el-table-column>
- <el-table-column prop="result" width="180" align="center">
+ <el-table-column prop="result" width="220" align="center" label="璇勫缁撴灉">
<template v-slot="{ row }">
<zt-dict v-model="row.result" placeholder="璇勫缁撴灉" dict="tristate1" :radio="true"
clearable></zt-dict>
@@ -51,7 +51,7 @@
</div>
</div>
</div>
- <div class="el-flexManageDialog el-border-bottom">
+ <div class="el-flexContractDialog el-border-bottom">
<div class="DFormWidth DAlign DHold">
璇勫璁板綍
</div>
@@ -62,7 +62,7 @@
</el-form-item>
</div>
</div>
- <div class="el-flexManageDialog el-border-bottom">
+ <div class="el-flexContractDialog el-border-bottom">
<div class="DFormWidth DAlign DHold">
瀹㈡埛鐨勭壒娈婅姹�
</div>
@@ -73,7 +73,7 @@
</el-form-item>
</div>
</div>
- <div class="el-flexManageDialog el-border-bottom">
+ <div class="el-flexContractDialog el-border-bottom">
<div class="DFormWidth DAlign DHold">
鍒嗗寘
</div>
@@ -84,7 +84,7 @@
</el-form-item>
</div>
</div>
- <div class="el-flexManageDialog el-border-bottom">
+ <div class="el-flexContractDialog el-border-bottom">
<div class="DFormWidth DAlign DHold">
璇勫缁撹
</div>
@@ -106,7 +106,7 @@
</el-form-item>
</div>
</div>
- <div class="el-flexManageDialog">
+ <div class="el-flexContractDialog">
<div class="DFormWidth DAlign DHold">
璇勫缁勬垚鍛�
</div>
@@ -227,7 +227,7 @@
border: 1px solid;
}
-.el-flexManageDialog {
+.el-flexContractDialog {
display: flex;
align-items: center;
}
diff --git a/web/src/views/modules/contractReview/ContractReview.vue b/web/src/views/modules/contractReview/ContractReview.vue
index acac3cd..4c1c91c 100644
--- a/web/src/views/modules/contractReview/ContractReview.vue
+++ b/web/src/views/modules/contractReview/ContractReview.vue
@@ -16,10 +16,10 @@
</el-form-item>
</el-form>
<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" width="40"/>
+ <el-table-column align="center" type="selection" width="40"/>
<el-table-column prop="code" label="缂栧彿"/>
<zt-table-column-dict prop="reviewType" width="150px" label="璇勫闃舵" dict="review_type"/>
- <el-table-column prop="orderCode" width="250px" label="濮旀墭鍗曠紪鍙�"/>
+ <el-table-column prop="orderCode" label="濮旀墭鍗曠紪鍙�"/>
<zt-table-column-handle :table="table" edit-perm="contractReview:update" delete-perm="contractReview::delete"/>
</el-table>
<!-- 寮圭獥, 鏂板 / 淇敼 -->
--
Gitblit v1.9.1