From 1772fc5e211f9e9e0ab4cdc6c29b436aac178c2a Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 23 二月 2024 12:19:55 +0800
Subject: [PATCH] 修改
---
web/src/views/modules/contractReview/ContractReview-AddOrUpdate.vue | 62 +++++++++++++++++++-----------
1 files changed, 39 insertions(+), 23 deletions(-)
diff --git a/web/src/views/modules/contractReview/ContractReview-AddOrUpdate.vue b/web/src/views/modules/contractReview/ContractReview-AddOrUpdate.vue
index 0a462f8..76d53c7 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>
@@ -36,21 +36,22 @@
<span v-html="indexFormat(scope.$index)"></span>
</template>
</el-table-column>
- <el-table-column prop="item" min-width="400" label="閰嶇疆椤瑰悕绉�">
+ <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" label="瀵嗙骇" 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"></zt-dict>
+ <zt-dict v-model="row.result" placeholder="璇勫缁撴灉" dict="tristate1" :radio="true"
+ clearable></zt-dict>
</template>
</el-table-column>
</el-table>
</div>
</div>
</div>
- <div class="el-flexManageDialog el-border-bottom">
+ <div class="el-flexContractDialog el-border-bottom">
<div class="DFormWidth DAlign DHold">
璇勫璁板綍
</div>
@@ -61,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>
@@ -72,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>
@@ -83,24 +84,29 @@
</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>
<div style="width: calc(100% - 120px)" class="el-border-left">
<el-form-item class="el-CMTextarea" style="width: 100%;padding: 5px">
- <el-input type="textarea" :rows="2" placeholder="璇疯緭鍏ュ唴瀹�"
+ <el-input type="textarea" :rows="2" placeholder="璇疯緭鍏ヨ瘎瀹＄粨璁�"
v-model="dataForm.contractReview.reviewConclusion"></el-input>
</el-form-item>
<el-form-item label="鎶�鏈礋璐ｄ汉锛�" style="width: 48%">
- <span>{{ dataForm.contractReview.technicalDirector }}</span>
+ <el-input placeholder="璇疯緭鍏ユ妧鏈礋璐ｄ汉"
+ v-model="dataForm.contractReview.technicalDirector"></el-input>
</el-form-item>
<el-form-item label="鏃ユ湡锛�" style="width: 48%">
- {{ dataForm.contractReview.reviewDate | filterTime('YYYY骞碝M鏈圖D鏃�') }}
+ <el-date-picker
+ v-model="dataForm.contractReview.reviewDate"
+ type="date"
+ placeholder="璇烽�夋嫨鏃ユ湡">
+ </el-date-picker>
</el-form-item>
</div>
</div>
- <div class="el-flexManageDialog">
+ <div class="el-flexContractDialog">
<div class="DFormWidth DAlign DHold">
璇勫缁勬垚鍛�
</div>
@@ -112,13 +118,17 @@
</div>
</div>
</div>
- <add-or-update-check ref="addOrUpdate" @recall="setCheckId"/>
+ <div class="el-flex review-sc" style="height: 60px">
+ <el-form-item class="marginTopAndMarginBottom" style="width: 100%">
+ <config-uploader :lineHeight="true" busi-type="contract_review" model-name="dataForm" :dataForm="dataForm"
+ v-model="dataForm.files"/>
+ </el-form-item>
+ </div>
</el-form>
<template v-slot:footer>
<el-button v-if="dataForm.disabled" type="primary" @click="print()">鎵撳嵃</el-button>
</template>
</zt-dialog>
-
</template>
<script>
@@ -130,6 +140,7 @@
return {
dataForm: {
id: '',
+ files:'',
contractReview: {
code: '',
orderCode: '',
@@ -171,27 +182,29 @@
let params = {
reviewId: this.dataForm.id,
projectId: this.dataForm.projectId
+
}
let res = await this.$http.get(`/contractReview/ContractReview/getDto`, {params: params})
this.dataForm = {
...this.dataForm,
...res.data
}
+ if(this.dataForm.contractReview === null){
+ this.dataForm.contractReview={}
+ }
+ if(this.dataForm.testAgencyInfo === null){
+ this.dataForm.testAgencyInfo={}
+ }
console.log(this.dataForm, "getInfo this.dataForm")
},
-
- setCheckId(checkId, row) {
- console.log(checkId, row, "setCheckId(checkId, row)")
- this.$set(row, 'checkId', checkId)
- },
- /*async print(){
+ async print(){
var params = qs.stringify({
token: Cookies.get('token'),
id:this.dataForm.id
})
- let apiURL = `/contractReview/ContractReview/exportWarehouseOrder`
+ let apiURL = `/contractReview/ContractReview/exportReview`
window.location.href = `${window.SITE_CONFIG['apiURL']}${apiURL}?${params}`
- },*/
+ },
// 琛ㄥ崟鎻愪氦
async formSubmit(submitType) {
let res = await this.$http[!this.dataForm.id ? 'post' : 'put']('/contractReview/ContractReview/', this.dataForm)
@@ -214,7 +227,7 @@
border: 1px solid;
}
-.el-flexManageDialog {
+.el-flexContractDialog {
display: flex;
align-items: center;
}
@@ -291,4 +304,7 @@
margin-top: -10px !important;
margin-bottom: 0 !important;
}
+.review-sc > .el-form-item > .el-form-item__content {
+ width:100%;
+}
</style>
--
Gitblit v1.9.1