From 2c89ccdc9e008060f8cd6608c9fcb014616987a3 Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期一, 20 十一月 2023 10:27:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue | 93 +++++++++++++++++++++++++---------------------
1 files changed, 51 insertions(+), 42 deletions(-)
diff --git a/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue b/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
index f7b563f..b1e8a9b 100644
--- a/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
+++ b/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
@@ -1,9 +1,9 @@
<template>
<zt-dialog ref="dialog" column="2" @confirm="formSubmit">
<el-form ref="form" :inline="true" :model="dataForm" :disabled="dataForm.disabled" label-width="120px"
- class="weiTuoDanAuto">
+ class="weiTuoDanAuto" style="padding-top: 0">
<div class="DManageForm">
- <el-form-item readonly label-width="60px" label="缂栧彿:" style="width: 99% ;margin-bottom:-5px">
+ <el-form-item readonly label-width="50px" label="缂栧彿:" style="width: 99% ;margin-bottom:-5px">
<span>{{ dataForm.softwareTestOrder.code}}</span>
</el-form-item>
</div>
@@ -105,12 +105,8 @@
<el-table class="el-software" height="230" border :data="dataForm.measuredList"
@cell-click="handleCellClick"
stripe>
- <el-table-column type="index" align="center" width="80" label="搴忓彿"/>
- <el-table-column min-width="300" label="鍚嶇О">
- <template slot-scope="scope">
- <span>{{ (dataForm.project.softwareName||'') + scope.row.name }}</span>
- </template>
- </el-table-column>
+ <el-table-column prop="no" align="center" width="80" label="搴忓彿"/>
+ <el-table-column prop="name" min-width="300" label="鍚嶇О"/>
<el-table-column align="center" prop="identify" width="180" label="鏍囪瘑/鐗堟湰">
<template slot-scope="scope">
<span v-if="editingCell && editingCell.row === scope.row && editingCell.column.property === scope.column.property">
@@ -122,10 +118,6 @@
<el-table-column label="鏄惁琚祴浠�" width="180" align="center">
<template slot-scope="scope">
<zt-dict v-model="scope.row.isMeasured" dict="is_or_not" :radio="true"></zt-dict>
- <!-- <el-radio-group v-model="scope.row.isMeasured">-->
- <!-- <el-radio :label="1">鏄�</el-radio>-->
- <!-- <el-radio :label="0">鍚�</el-radio>-->
- <!-- </el-radio-group>-->
</template>
</el-table-column>
</el-table>
@@ -137,11 +129,6 @@
</div>
<div style="width: calc(100% - 120px)">
<zt-dict v-model="dataForm.project.softwareType" :radio="true" dict="software_type"></zt-dict>
- <!-- <el-checkbox-group v-model="dataForm.checkList">-->
- <!-- <el-checkbox :label="0">閫氱敤搴旂敤杞欢</el-checkbox>-->
- <!-- <el-checkbox :label="1">琛屼笟搴旂敤杞欢</el-checkbox>-->
- <!-- <el-checkbox :label="2">宓屽叆寮忚蒋浠�</el-checkbox>-->
- <!-- </el-checkbox-group>-->
</div>
</div>
</div>
@@ -159,11 +146,6 @@
<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></zt-dict>
- <!-- <el-checkbox-group v-model="dataForm.checkList">-->
- <!-- <el-checkbox :label="0">GB/T 25000.21-2016</el-checkbox>-->
- <!-- <el-checkbox :label="1">GJB/Z 141-2004</el-checkbox>-->
- <!-- <el-checkbox :label="2">鍏朵粬锛歿{dataForm.other}}</el-checkbox>-->
- <!-- </el-checkbox-group>-->
</el-form-item>
</div>
</div>
@@ -171,7 +153,7 @@
<div class="DWidth DAlign DHold">
娴嬭瘯绫诲瀷
</div>
- <div class="el-border-left" style="width: 98%">
+ <div class="el-border-left test-type-line-height" style="width: 98%">
<el-form-item style="width: 40%;padding-left:5%;margin-bottom: 0">
<zt-dict-checkbox v-model="dataForm.softwareTestOrder.testType1" column="2" dict="test_type1"
clearable></zt-dict-checkbox>
@@ -198,7 +180,7 @@
</div>
<div class="el-border-left" style="width: 98%">
<el-form-item style="padding-left:5%;margin-bottom:0">
- <zt-dict v-model="dataForm.project.testLevel" :radio="true" dict="test_level"></zt-dict>
+ <zt-dict v-model="dataForm.softwareTestOrder.testLevel" :radio="true" dict="test_level"></zt-dict>
</el-form-item>
</div>
</div>
@@ -231,7 +213,7 @@
<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="is_stamp"></zt-dict>
+ dict="other_require"></zt-dict>
</el-form-item>
</div>
</div>
@@ -244,15 +226,10 @@
<div class="" style="width: 100%;">
<div class="el-flex " style="height: 40px">
<div style="width: 70%">
- <span>{{ dataForm.write }}</span>
+ <span>{{ dataForm.softwareTestOrder.entrustSign }}</span>
</div>
<div class="el-flex">
- <div style="width: 60px;text-align: center">{{ dataForm.year }}</div>
- 骞�
- <div style="width: 40px;text-align: center">{{ dataForm.month }}</div>
- 鏈�
- <div style="width: 40px;text-align: center">{{ dataForm.day }}</div>
- 鏃�
+ {{ dataForm.softwareTestOrder.entrustSignDate | filterTime('YYYY骞碝M鏈圖D鏃�') }}
</div>
</div>
</div>
@@ -365,17 +342,17 @@
<div class="" style="width: 100%;">
<div class="el-flex" style="height: 40px">
<div style="width: 70%">
- <span>{{ dataForm.write }}</span>
+ <span>{{ dataForm.contractSign }}</span>
</div>
<div class="el-flex">
- {{ dataForm.softwareTestOrder.deliveryDate | filterTime('YYYY骞碝M鏈圖D鏃�') }}
+ {{ dataForm.softwareTestOrder.contractSignDate | filterTime('YYYY骞碝M鏈圖D鏃�') }}
</div>
</div>
</div>
</div>
</div>
</div>
- <div class="el-flex">
+ <div class="el-flex el-border-bottom">
<div class="DPadding3 DAlign DHold">
璇存槑
</div>
@@ -391,6 +368,15 @@
</span>
</div>
</div>
+ </div>
+ <div class="el-flex order-sc" style="height: 170px">
+<!-- <div class="DPadding3 DAlign DHold">-->
+<!-- 濮旀墭鍗曚笂浼�-->
+<!-- </div>-->
+ <el-form-item class="marginTopAndMarginBottom" style="width: 100%">
+ <config-uploader busi-type="test_order" model-name="dataForm" :dataForm="dataForm"
+ v-model="dataForm.files"/>
+ </el-form-item>
</div>
</div>
@@ -429,6 +415,10 @@
testCost:'',
articleNature:'',
sampleStatus:'',
+ entrustSign:'',
+ entrustSignDate:'',
+ contractSign:'',
+ contractSignDate:''
},
project: {
code: '',
@@ -501,9 +491,14 @@
...res.data
}
if(this.dataForm.softwareTestOrder){
- this.dataForm.softwareTestOrder.testType1=this.dataForm.softwareTestOrder.testType1.split(',')
- this.dataForm.softwareTestOrder.testType2=this.dataForm.softwareTestOrder.testType2.split(',')
- console.log(this.dataForm.softwareTestOrder.testType1)
+ if(this.dataForm.softwareTestOrder.testType1){
+ this.dataForm.softwareTestOrder.testType1=this.dataForm.softwareTestOrder.testType1.split(',')
+ console.log(this.dataForm.softwareTestOrder.testType1)
+ }
+ if(this.dataForm.softwareTestOrder.testType2){
+ this.dataForm.softwareTestOrder.testType2=this.dataForm.softwareTestOrder.testType2.split(',')
+ console.log(this.dataForm.softwareTestOrder.testType2)
+ }
}
if(this.dataForm.project === null){
this.dataForm.project={}
@@ -528,8 +523,12 @@
// 琛ㄥ崟鎻愪氦
async formSubmit() {
console.log(this.dataForm, ' this.dataForm')
- this.dataForm.softwareTestOrder.testType1=this.dataForm.softwareTestOrder.testType1.join(',')
- this.dataForm.softwareTestOrder.testType2=this.dataForm.softwareTestOrder.testType2.join(',')
+ if(this.dataForm.softwareTestOrder.testType1){
+ this.dataForm.softwareTestOrder.testType1=this.dataForm.softwareTestOrder.testType1.join(',')
+ }
+ if(this.dataForm.softwareTestOrder.testType2){
+ this.dataForm.softwareTestOrder.testType2=this.dataForm.softwareTestOrder.testType2.join(',')
+ }
console.log(this.dataForm.softwareTestOrder.testType1)
let res = await this.$http[!this.dataForm.id ? 'post' : 'put']('/project/SoftwareTestOrder/', this.dataForm)
if (res.success) {
@@ -537,8 +536,12 @@
this.$refs.dialog.close()
this.$emit('refreshDataList')
}else{
- this.dataForm.softwareTestOrder.testType1=this.dataForm.softwareTestOrder.testType1.split(',')
- this.dataForm.softwareTestOrder.testType2=this.dataForm.softwareTestOrder.testType2.split(',')
+ if(this.dataForm.softwareTestOrder.testType1){
+ this.dataForm.softwareTestOrder.testType1=this.dataForm.softwareTestOrder.testType1.split(',')
+ }
+ if(this.dataForm.softwareTestOrder.testType2){
+ this.dataForm.softwareTestOrder.testType2=this.dataForm.softwareTestOrder.testType2.split(',')
+ }
}
}
}
@@ -641,4 +644,10 @@
.csjgxx > .el-form-item > .el-form-item__content {
width: calc(100% - 130px);
}
+.order-sc > .el-form-item > .el-form-item__content {
+ width:100%;
+}
+.test-type-line-height>.el-form-item>.el-form-item__content{
+ line-height: 30px;
+}
</style>
--
Gitblit v1.9.1