From c4d808b6d41a77603ebffbd0cf599e9fa1234ab0 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 08 十二月 2023 09:42:15 +0800
Subject: [PATCH] 修改
---
web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue b/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
index 84a6df9..cace7e2 100644
--- a/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
+++ b/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
@@ -1,5 +1,5 @@
<template>
- <zt-dialog ref="dialog" column="2" @confirm="formSubmit">
+ <zt-dialog ref="dialog" column="2" @confirm="formSubmit" >
<el-form ref="form" :inline="true" :model="dataForm" :disabled="dataForm.disabled" label-width="93px"
class="weiTuoDanAuto" style="padding-top: 0">
<div class="DManageForm">
@@ -130,7 +130,7 @@
<div class="el-border-left" style="width: 98%">
<el-form-item style="width: 20%;padding-left:5%;margin-bottom: 0">
<zt-dict v-model="dataForm.softwareTestOrder.testBasis" :radio="true" dict="test_basis"
- clearable :inputName="dataForm.softwareTestOrder.otherBasis"></zt-dict>
+ clearable :inputName="dataForm.softwareTestOrder.otherBasis" origin="otherBasis" @getChangeInputData="getChangeInputData"></zt-dict>
</el-form-item>
</div>
</div>
@@ -156,6 +156,7 @@
<div class="el-border-left" style="width: 98%">
<el-form-item style="width: 20%;padding-left:5%;margin-bottom: 0">
<zt-dict v-model="dataForm.softwareTestOrder.testStandard" :radio="true"
+ origin="otherStandard" @getChangeInputData="getChangeInputData"
dict="test_standard" :inputName="dataForm.softwareTestOrder.otherStandard">
</zt-dict>
</el-form-item>
@@ -214,7 +215,8 @@
<div class="el-border-left" style="width: 98%;">
<el-form-item label="鏄惁鐩朇NAS绔�" label-width="130px" style="padding-left:5%;margin-bottom:0">
<zt-dict v-model="dataForm.softwareTestOrder.otherRequire" :radio="true"
- dict="other_require"></zt-dict>
+ dict="is_or_not"></zt-dict>
+ <span>鍏朵粬:<el-input class="requireOther" v-model="dataForm.softwareTestOrder.requireOther"></el-input></span>
</el-form-item>
</div>
</div>
@@ -227,8 +229,8 @@
<div class="" style="width: 100%;">
<div class="el-flex " style="height: 40px">
<div style="width: 60%">
-<!-- <span>{{ dataForm.softwareTestOrder.entrustSign }}</span>-->
- <zt-select v-model="dataForm.softwareTestOrder.entrustSign" url="/sys/userEx/getUsersList" :multiple="true" :clearable="true" placeholder="濮旀墭鏂逛汉鍛�"/>
+ <span>{{ dataForm.softwareTestOrder.entrustSign }}</span>
+<!-- <zt-select v-model="dataForm.softwareTestOrder.entrustSign" url="/sys/userEx/getUsersList" :multiple="true" :clearable="true" placeholder="濮旀墭鏂逛汉鍛�"/>-->
</div>
<div class="el-flex" style="margin-left: 10%">
<el-date-picker
@@ -293,9 +295,10 @@
<div class="DWidth DAlign DHold">
鐗╁搧鎬ц川
</div>
- <div class="el-border-left" style="width: 15%">
- <el-form-item style="width: 98%;padding-left:20px;margin:0;">
+ <div class="el-border-left" style="width: 98%">
+ <el-form-item style="width: 20%;padding-left:20px;margin:0;">
<zt-dict v-model="dataForm.softwareTestOrder.articleNature" :radio="true"
+ origin="otherNature" @getChangeInputData="getChangeInputData"
dict="article_nature" :inputName="dataForm.softwareTestOrder.otherNature"></zt-dict>
</el-form-item>
</div>
@@ -373,7 +376,7 @@
<div class="" style="width: 100%;">
<div class="el-flex" style="height: 40px">
<div style="width: 60%">
- <zt-select v-model="dataForm.softwareTestOrder.contractSign" url="/sys/userEx/getUsersList" :multiple="true" :clearable="true" placeholder="鎵挎墭鏂逛汉鍛�"/>
+ <zt-select v-model="dataForm.softwareTestOrder.contractSign" url="/sys/userEx/getUsersList" placeholder="鎵挎墭鏂逛汉鍛�"/>
<!-- <span>{{ dataForm.contractSign }}</span>-->
</div>
<div class="el-flex" style="margin-left: 10%">
@@ -411,7 +414,7 @@
<!-- 濮旀墭鍗曚笂浼�-->
<!-- </div>-->
<el-form-item class="marginTopAndMarginBottom" style="width: 100%">
- <config-uploader busi-type="test_order" model-name="dataForm" :dataForm="dataForm"
+ <config-uploader :lineHeight="true" busi-type="test_order" model-name="dataForm" :dataForm="dataForm"
v-model="dataForm.files"/>
</el-form-item>
</div>
@@ -508,6 +511,12 @@
// this.inputName='q14eeff'
// }
// },
+ getChangeInputData(data,ogn){
+ // console.log(ogn)
+ this.$set(this.dataForm.softwareTestOrder, ogn, data);
+ console.log(this.dataForm.softwareTestOrder[ogn]);
+ // console.log(this.dataForm.softwareTestOrder[ogn])
+ },
handleCellClick(row, column) {
this.editingCell = {row, column}
this.$nextTick(() => {
@@ -559,6 +568,7 @@
}
}
// console.log(this.dataForm, "this.dataForm")
+ console.log(this.dataForm,"getInfo this.dataForm")
},
async print(){
var params = qs.stringify({
@@ -570,7 +580,7 @@
},
// 琛ㄥ崟鎻愪氦
async formSubmit() {
- console.log(this.dataForm, ' this.dataForm')
+ console.log(this.dataForm, 'formSubmit this.dataForm')
if(this.dataForm.softwareTestOrder.testType1){
this.dataForm.softwareTestOrder.testType1=this.dataForm.softwareTestOrder.testType1.join(',')
}
@@ -709,4 +719,7 @@
.test-type-line-height>.el-form-item>.el-form-item__content{
line-height: 30px;
}
+.requireOther.el-input{
+ position: absolute;
+}
</style>
--
Gitblit v1.9.1