From 8a7246e2afb3b718948f66ddbaaed2bef33a8830 Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期一, 13 十一月 2023 09:44:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/project/Project-AddOrUpdate.vue | 2
web/src/views/modules/project/Project.vue | 2
web/src/views/modules/project/SoftwareTestOrder.vue | 4
web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue | 616 +++++++++++++++++++++++++++++++++++++++++++++++++------
4 files changed, 549 insertions(+), 75 deletions(-)
diff --git a/web/src/views/modules/project/Project-AddOrUpdate.vue b/web/src/views/modules/project/Project-AddOrUpdate.vue
index 8041f43..90218e6 100644
--- a/web/src/views/modules/project/Project-AddOrUpdate.vue
+++ b/web/src/views/modules/project/Project-AddOrUpdate.vue
@@ -3,7 +3,7 @@
<!-- <div class="fa-card-a fa-box-a" style="height: calc(100vh - 130px)">-->
<el-form ref="dataForm" style="padding: 0" :inline="true" :disabled="dataForm.disabled" :model="dataForm" label-width="120px" class="projectAuto">
<div class="DManageForm el-border-bottom">
- <zt-form-item label-width="60px" label="椤圭洰缂栧彿" prop="code" style="width: 99%" rules="required">
+ <zt-form-item label-width="60px" label="椤圭洰缂栧彿" prop="code" style="width: 99%" readonly>
<el-input v-model="dataForm.code"></el-input>
</zt-form-item>
</div>
diff --git a/web/src/views/modules/project/Project.vue b/web/src/views/modules/project/Project.vue
index d2515bd..0c4607c 100644
--- a/web/src/views/modules/project/Project.vue
+++ b/web/src/views/modules/project/Project.vue
@@ -34,7 +34,7 @@
</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 type="selection" align="center" width="40"/>
<el-table-column prop="entrustUnitName" label="濮旀墭鍗曚綅鍚嶇О"/>
<el-table-column prop="developUnitName" label="寮�鍙戝崟浣嶅悕绉�"/>
<el-table-column prop="softwareName" label="杞欢鍚嶇О"/>
diff --git a/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue b/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
index 0e789fc..4154fa8 100644
--- a/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
+++ b/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
@@ -1,73 +1,447 @@
<template>
<zt-dialog ref="dialog" column="2" @confirm="formSubmit">
- <el-form :model="dataForm" ref="dataForm" :disabled="dataForm.disabled" label-width="120px">
- <zt-form-item label="杩愯鐜" prop="optEnviron" rules="required">
- <el-input v-model="dataForm.optEnviron"></el-input>
- </zt-form-item>
- <zt-form-item label="缂栫▼璇█" prop="programLang" rules="required">
- <el-input v-model="dataForm.programLang"></el-input>
- </zt-form-item>
- <zt-form-item label="娴嬭瘯渚濇嵁" prop="testBasis" rules="required">
- <zt-dict v-model="dataForm.testBasis" dict="test_basis"></zt-dict>
- </zt-form-item>
- <zt-form-item label="娴嬭瘯绫诲瀷" prop="testType" rules="required">
- <zt-dict v-model="dataForm.testType" dict="test_type1"></zt-dict>
- </zt-form-item>
- <zt-form-item label="娴嬭瘯鏍囧噯" prop="testStandard" rules="required">
- <zt-dict v-model="dataForm.testStandard" dict="test_standard"></zt-dict>
- </zt-form-item>
- <zt-form-item label="寮�濮嬫棩鏈�" prop="startDate" rules="required">
- <el-input v-model="dataForm.startDate"></el-input>
- </zt-form-item>
- <zt-form-item label="缁撴潫鏃ユ湡" prop="endDate" rules="required">
- <el-input v-model="dataForm.endDate"></el-input>
- </zt-form-item>
- <zt-form-item label="娴嬭瘯鍦哄湴" prop="testVenue" rules="required">
- <el-input v-model="dataForm.testVenue"></el-input>
- </zt-form-item>
- <zt-form-item label="鍏朵粬瑕佹眰" prop="otherRequire" rules="required">
- <el-input v-model="dataForm.otherRequire"></el-input>
- </zt-form-item>
- <zt-form-item label="娴嬭瘯鏃ユ湡" prop="testDate" rules="required">
- <el-input v-model="dataForm.testDate"></el-input>
- </zt-form-item>
- <zt-form-item label="浜や粯鏃ユ湡" prop="deliveryDate" rules="required">
- <el-input v-model="dataForm.deliveryDate"></el-input>
- </zt-form-item>
- <zt-form-item label="妫�娴嬭垂鐢�" prop="testCost" rules="required">
- <el-input v-model="dataForm.testCost"></el-input>
- </zt-form-item>
- <zt-form-item label="鐗╁搧鎬ц川" prop="articleNature" rules="required">
- <zt-dict v-model="dataForm.articleNature" dict="article_nature"></zt-dict>
- </zt-form-item>
- <zt-form-item label="鏍峰搧鐘舵��" prop="sampleStatus" rules="required">
- <el-input v-model="dataForm.sampleStatus"></el-input>
- </zt-form-item>
- <zt-form-item label="娴嬭瘎鏈烘瀯鍚嶇О" prop="agencyName" rules="required">
- <el-input v-model="dataForm.agencyName"></el-input>
- </zt-form-item>
- <zt-form-item label="鍦板潃" prop="site" rules="required">
- <el-input v-model="dataForm.site"></el-input>
- </zt-form-item>
- <zt-form-item label="涓氬姟鑱旂郴" prop="businContact" rules="required">
- <el-input v-model="dataForm.businContact"></el-input>
- </zt-form-item>
- <zt-form-item label="涓氬姟鎶曡瘔" prop="businComplaint" rules="required">
- <el-input v-model="dataForm.businComplaint"></el-input>
- </zt-form-item>
- <zt-form-item label="瀹為獙瀹よ仈绯讳汉" prop="laborContact" rules="required">
- <el-input v-model="dataForm.laborContact"></el-input>
- </zt-form-item>
- <zt-form-item label="瀹為獙瀹よ仈绯荤數璇�" prop="labContactNum" rules="required">
- <el-input v-model="dataForm.labContactNum"></el-input>
- </zt-form-item>
- <zt-form-item label="閭斂缂栫爜" prop="postalCode" rules="required">
- <el-input v-model="dataForm.postalCode"></el-input>
- </zt-form-item>
- <zt-form-item label="浼犵湡" prop="fax" rules="required">
- <el-input v-model="dataForm.fax"></el-input>
- </zt-form-item>
+ <el-form ref="form" :inline="true" :model="dataForm" label-width="120px" class="weiTuoDanAuto">
+ <div class="DManageForm">
+ <el-form-item label-width="60px" label="缂栧彿:" style="width: 99%">
+ <span>{{dataForm.project.code}}</span>
+ </el-form-item>
+ </div>
+ <div style="border: 1px solid rgba(0,0,0,.2)">
+ <div class="el-flex el-border-bottom">
+ <div class="DPadding1 DAlign DHold">
+ 濮旀墭鏂�
+ </div>
+ <div class="el-border-left">
+ <div class="el-flex el-border-bottom">
+ <div class="DWidth DAlign DHold">
+ 濮旀墭鍗曚綅
+ </div>
+ <div class="DOldForm el-border-left">
+ <!-- 鍗曚綅鍚嶇О -->
+ <el-form-item label="鍗曚綅鍚嶇О" style="width: 49%">
+ <el-input v-model="dataForm.project.entrustUnitName" placeholder="璇疯緭鍏ュ崟浣嶅悕绉�"></el-input>
+ </el-form-item>
+ <!-- 鑱旂郴浜� -->
+ <el-form-item label="鑱旂郴浜�" style="width: 49%">
+ <el-input v-model="dataForm.project.entrustUnitContact" placeholder="璇疯緭鍏ヨ仈绯讳汉"></el-input>
+ </el-form-item>
+ <!-- 璇︾粏鍦板潃 -->
+ <el-form-item label="璇︾粏鍦板潃" style="width: 49%">
+ <el-input v-model="dataForm.project.entrustUnitAddress" placeholder="璇疯緭鍏ヨ缁嗗湴鍧�"></el-input>
+ </el-form-item>
+ <!-- 鑱旂郴鏂瑰紡 -->
+ <el-form-item label="鑱旂郴鏂瑰紡" style="width: 49%">
+ <el-input v-model="dataForm.project.entrustUnitContWay" placeholder="璇疯緭鍏ヨ仈绯绘柟寮�"></el-input>
+ </el-form-item>
+ </div>
+ </div>
+ <div class="el-flex el-border-bottom">
+ <div class="DWidth DAlign DHold">
+ 寮�鍙戝崟浣�
+ </div>
+ <div class="DOldForm el-border-left">
+ <!-- 鍗曚綅鍚嶇О -->
+ <el-form-item label="鍗曚綅鍚嶇О" style="width: 49%">
+ <el-input v-model="dataForm.project.developUnitName" placeholder="璇疯緭鍏ュ崟浣嶅悕绉�"></el-input>
+ </el-form-item>
+ <!-- 鑱旂郴浜� -->
+ <el-form-item label="鑱旂郴浜�" style="width: 49%">
+ <el-input v-model="dataForm.project.developUnitContact" placeholder="璇疯緭鍏ヨ仈绯讳汉"></el-input>
+ </el-form-item>
+ <!-- 璇︾粏鍦板潃 -->
+ <el-form-item label="璇︾粏鍦板潃" style="width: 49%">
+ <el-input v-model="dataForm.project.developUnitAddress" placeholder="璇疯緭鍏ヨ缁嗗湴鍧�"></el-input>
+ </el-form-item>
+ <!-- 鑱旂郴鏂瑰紡 -->
+ <el-form-item label="鑱旂郴鏂瑰紡" style="width: 49%">
+ <el-input v-model="dataForm.project.developUnitContWay" placeholder="璇疯緭鍏ヨ仈绯绘柟寮�"></el-input>
+ </el-form-item>
+ </div>
+ </div>
+ <div class="el-flex el-border-bottom">
+ <div class="DWidth-Unt DAlign DHold">
+ 琚祴浠朵俊鎭�
+ </div>
+ <div class="DOldForm el-border-left">
+ <!-- 鍗曚綅鍚嶇О -->
+ <el-form-item label="杞欢鍚嶇О" style="width: 49%">
+ <el-input v-model="dataForm.project.softwareName" placeholder="璇疯緭鍏ヨ蒋浠跺悕绉�"></el-input>
+ </el-form-item>
+ <!-- 鑱旂郴浜� -->
+ <el-form-item label="杞欢鏍囪瘑" style="width: 49%">
+ <el-input v-model="dataForm.project.identity" placeholder="璇疯緭鍏ヨ蒋浠舵爣璇�"></el-input>
+ </el-form-item>
+ <!-- 璇︾粏鍦板潃 -->
+ <el-form-item label="瀵嗙骇" style="width: 49%">
+ <zt-dict v-model="dataForm.project.secretClass" placeholder="瀵嗙骇" dict="secret_class" clearable></zt-dict>
+ </el-form-item>
+ <!-- <zt-form-item label="淇濆瘑绾у埆" prop="secretClass" style="width: 25%">-->
+ <!-- <zt-dict v-model="datadataForm.secretClass" dict="secret_class" placeholder="淇濆瘑绾у埆" style="width:200px"></zt-dict>-->
+ <!-- </zt-form-item>-->
+ <!-- 鑱旂郴鏂瑰紡 -->
+ <el-form-item label="鍏抽敭绛夌骇" style="width: 49%">
+ <zt-dict v-model="dataForm.project.criticalLevel" :radio="true" placeholder="鍏抽敭绛夌骇" clearable dict="critical_level" ></zt-dict>
+ </el-form-item>
+ <el-form-item label="杩愯鐜" style="width: 49%">
+ <el-input v-model="dataForm.softwareTestOrder.optEnviron" placeholder="璇疯緭鍏ヨ繍琛岀幆澧�"></el-input>
+ </el-form-item>
+ <el-form-item label="缂栫▼璇█" style="width: 49%">
+ <el-input v-model="dataForm.softwareTestOrder.programLang" placeholder="璇疯緭鍏ョ紪绋嬭瑷�"></el-input>
+ </el-form-item>
+ <div class="el-flex el-border-top-and-bottom">
+ <div class="DWidth DAlign DHold">
+ 琚祴浠跺強鍏朵粬鐩稿叧鐗╁搧娓呭崟
+ </div>
+ <div style="width: calc(100% - 120px);padding: 5px">
+ <el-table class="el-software" height="230" border :data="dataForm.softwareTestOrderMeasured"
+ stripe>
+ <el-table-column prop="num" align="center" width="80" label="搴忓彿"></el-table-column>
+ <el-table-column prop="name" min-width="300" label="鍚嶇О"></el-table-column>
+ <el-table-column prop="identify" align="center" width="180" label="鏍囪瘑/鐗堟湰"></el-table-column>
+ <el-table-column label="鏄惁琚祴浠�" width="180" align="center">
+ <template slot-scope="scope">
+ <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>
+ </div>
+ </div>
+ <div class="el-flex" style="height: 40px;">
+ <div class="DWidth DAlign DHold">
+ 杞欢绫诲瀷
+ </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>
+ </div>
+ <div class="el-flex el-border-bottom">
+ <div class="DWidth DAlign DHold">
+ 娴嬭瘯瑕佹眰
+ </div>
+ <div class="el-border-left" style="width: 100%;">
+ <div class="el-flex el-border-bottom">
+ <div class="DWidth DAlign DHold">
+ 娴嬭瘯渚濇嵁
+ </div>
+ <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></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>
+ <div class="el-flex el-border-bottom">
+ <div class="DWidth DAlign DHold">
+ 娴嬭瘯绫诲瀷
+ </div>
+ <div class="el-border-left" style="width: 98%">
+ <el-form-item style="width: 40%;padding-left:5%;">
+ <zt-dict-checkbox v-model="dataForm.softwareTestOrder.testType" column="2" dict="test_type1" clearable></zt-dict-checkbox>
+ </el-form-item>
+ <el-form-item style="width: 60%;padding-left: 15%;border-left: 1px solid rgba(0,0,0,.2);">
+ <zt-dict-checkbox v-model="dataForm.softwareTestOrder.testType" dict="test_type2" clearable></zt-dict-checkbox>
+ </el-form-item>
+ </div>
+ </div>
+ <div class="el-flex el-border-bottom">
+ <div class="DWidth DAlign DHold">
+ 娴嬭瘯鐩稿叧鏍囧噯/瑕佹眰
+ </div>
+ <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" dict="test_standard"></zt-dict>
+<!-- <el-checkbox-group v-model="dataForm.checkList">-->
+<!-- <el-checkbox :label="0">GJB 438B-2009銆婂啗鐢ㄨ蒋浠跺紑鍙戞枃妗ｉ�氱敤瑕佹眰銆�</el-checkbox>-->
+<!-- <el-checkbox :label="1">HJB 754-2017 銆婃捣鍐涘啗鐢ㄨ蒋浠跺畾鍨嬫祴璇勫ぇ绾茬紪鍒惰姹傘��</el-checkbox>-->
+<!-- <el-checkbox :label="2">HJB 753-2017 銆婃捣鍐涘啗鐢ㄨ蒋浠跺畾鍨嬫祴璇勬姤鍛婄紪鍒惰姹傘��</el-checkbox>-->
+<!-- <el-checkbox :label="3">銆婃捣鍐涜澶囪蒋浠舵祴璇曠粏鍒欍��</el-checkbox>-->
+<!-- <el-checkbox :label="4">鍏朵粬锛歿{dataForm.other}}</el-checkbox>-->
+<!-- </el-checkbox-group>-->
+ </el-form-item>
+ </div>
+ </div>
+ <div class="el-flex el-border-bottom">
+ <div class="DWidth DAlign DHold">
+ 娴嬭瘯绾у埆
+ </div>
+ <div class="el-border-left" style="width: 98%">
+ <el-form-item style="padding-left:5%;">
+ <zt-dict v-model="dataForm.project.testLevel" :radio="true" dict="test_level"></zt-dict>
+<!-- <el-checkbox-group v-model="dataForm.checkList">-->
+<!-- <el-checkbox :label="0">閰嶇疆椤规祴璇�</el-checkbox>-->
+<!-- <el-checkbox :label="1">绯荤粺娴嬭瘯</el-checkbox>-->
+<!-- </el-checkbox-group>-->
+ </el-form-item>
+ </div>
+ </div>
+ <div class="DOldForm">
+ <el-form-item label="寮�濮嬫棩鏈�" style="width: 49%">
+ <el-input v-model="dataForm.softwareTestOrder.startDate" placeholder="璇疯緭鍏ュ崟浣嶅悕绉�"></el-input>
+ </el-form-item>
+ <!-- 鑱旂郴浜� -->
+ <el-form-item label="缁撴潫鏃ユ湡" style="width: 49%">
+ <el-input v-model="dataForm.softwareTestOrder.endDate" placeholder="璇疯緭鍏ヨ仈绯讳汉"></el-input>
+ </el-form-item>
+ </div>
+ <div class="DOldForm el-border-bottom">
+ <el-form-item label="娴嬭瘯鍦哄湴" style="width: 98%">
+ <el-input v-model="dataForm.softwareTestOrder.testVenue" placeholder="璇疯緭鍏ュ崟浣嶅悕绉�"></el-input>
+ </el-form-item>
+ </div>
+ <div class="el-flex">
+ <div class="DWidth DAlign DHold">
+ 鍏朵粬瑕佹眰
+ </div>
+ <div class="el-border-left" style="width: 98%">
+ <el-form-item label="鏄惁鐩朇NAS绔�" label-width="130px" style="padding-left:5%;">
+ <zt-dict v-model="dataForm.softwareTestOrder.otherRequire" :radio="true" dict="is_or_not"></zt-dict>
+ </el-form-item>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="el-flex">
+ <div class="DWidth DAlign DHold">
+ 濮旀墭鏂圭瀛�:
+ </div>
+ <div class="" style="width: 100%;">
+ <div class="el-flex " style="height: 40px">
+ <div style="width: 50%">
+ <span>{{dataForm.write}}</span>
+ </div>
+ <div class="el-flex">
+ <div style="width: 120px;text-align: center">{{dataForm.year}}</div>骞�
+ <div style="width: 80px;text-align: center">{{dataForm.month}}</div>鏈�
+ <div style="width: 80px;text-align: center">{{dataForm.day}}</div>鏃�
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="el-flex el-border-bottom">
+ <div class="DPadding2 DAlign DHold">
+ 鎵挎墭鏂�
+ </div>
+ <div class="el-border-left">
+ <div class="el-flex el-border-bottom">
+ <div class="DWidth-Unt DAlign DHold">
+ 娴嬭瘯淇℃伅
+ </div>
+ <div class="DOldForm el-border-left">
+ <!-- 鍗曚綅鍚嶇О -->
+ <el-form-item label="娴嬭瘯鏃ユ湡" style="width: 49%">
+ <el-input v-model="dataForm.softwareTestOrder.testDate" placeholder="璇疯緭鍏ユ祴璇曟棩鏈�"></el-input>
+ </el-form-item>
+ <!-- 鑱旂郴浜� -->
+ <el-form-item label="浜や粯鏃ユ湡" style="width: 49%">
+ <el-input v-model="dataForm.softwareTestOrder.deliveryDate" placeholder="璇疯緭鍏ヤ氦浠樻棩鏈�"></el-input>
+ </el-form-item>
+ <!-- 璇︾粏鍦板潃 -->
+ <el-form-item label="妫�娴嬭垂鐢�" style="width: 98%">
+ <el-input v-model="dataForm.softwareTestOrder.testCost" placeholder="璇疯緭鍏ユ娴嬭垂鐢�"></el-input>
+ </el-form-item>
+ <!-- <zt-form-item label="淇濆瘑绾у埆" prop="secretClass" style="width: 25%">-->
+ <!-- <zt-dict v-model="datadataForm.secretClass" dict="secret_class" placeholder="淇濆瘑绾у埆" style="width:200px"></zt-dict>-->
+ <!-- </zt-form-item>-->
+ <!-- 鑱旂郴鏂瑰紡 -->
+ <el-form-item class="el-border-bottom" label="鐗╁搧鎬ц川" style="width: 98%">
+ <zt-dict v-model="dataForm.softwareTestOrder.articleNature" :radio="true" dict="article_nature"></zt-dict>
+<!-- <el-radio-group v-model="dataForm.criticalLevel">-->
+<!-- <el-radio :label="0">鐜板満妫�娴�</el-radio>-->
+<!-- <el-radio :label="1">瀹㈡埛閫佹牱</el-radio>-->
+<!-- <el-radio :label="2">鍏朵粬锛歿{dataForm.other}}</el-radio>-->
+<!-- </el-radio-group>-->
+ </el-form-item>
+ <div class="el-flex el-border-bottom">
+ <div class="DWidth DAlign DHold">
+ 鏍峰搧鐘舵��
+ </div>
+ <div class="el-border-left" style="width: 100%;margin-bottom: 0">
+ <el-form-item label="鏄惁婊¤冻娴嬭瘯瑕佹眰:" label-width="160px">
+ <zt-dict v-model="dataForm.softwareTestOrder.sampleStatus" :radio="true" dict="is_satisfy"></zt-dict>
+<!-- <el-radio-group v-model="dataForm.checkList">-->
+<!-- <el-radio :label="0">鏄�</el-radio>-->
+<!-- <el-radio :label="1">鍚�</el-radio>-->
+<!-- </el-radio-group>-->
+ </el-form-item>
+ </div>
+ </div>
+ <div class="el-flex el-border-top">
+ <div class="DWidth DAlign DHold">
+ 浜や粯鐗╂竻鍗�
+ </div>
+ <div style="width: calc(100% - 120px);padding: 5px">
+ <el-table class="el-software" height="230" border :data="dataForm.softwareTestOrderDeliverable"
+ stripe>
+ <el-table-column prop="num" align="center" width="80" label="搴忓彿"></el-table-column>
+ <el-table-column prop="name" min-width="300" label="鍚嶇О"></el-table-column>
+ <el-table-column prop="identify" align="center" width="380" label="鏍囪瘑/鐗堟湰"></el-table-column>
+ </el-table>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="el-flex el-border-bottom">
+ <div class="DWidth DAlign DHold">
+ 娴嬭瘯鏈烘瀯淇℃伅
+ </div>
+ <div class="el-border-left DOldForm" style="width: 100%;">
+ <el-form-item label-width="120px" label="娴嬭瘎鏈烘瀯鍚嶇О" style="width: 98%">
+ <el-input v-model="dataForm.testAgencyInfo.agencyName" placeholder="璇疯緭鍏ュ崟浣嶅悕绉�"></el-input>
+ </el-form-item>
+ <!-- 鑱旂郴浜� -->
+ <el-form-item label-width="120px" label="鍦板潃" style="width: 98%">
+ <el-input v-model="dataForm.testAgencyInfo.site" placeholder="璇疯緭鍏ヨ仈绯讳汉"></el-input>
+ </el-form-item>
+ <!-- 璇︾粏鍦板潃 -->
+ <el-form-item label-width="120px" label="涓氬姟鑱旂郴" style="width: 49%">
+ <el-input v-model="dataForm.testAgencyInfo.businContact" placeholder="璇疯緭鍏ヨ缁嗗湴鍧�"></el-input>
+ </el-form-item>
+ <el-form-item label-width="120px" label="涓氬姟鎶曡瘔" style="width: 49%">
+ <el-input v-model="dataForm.testAgencyInfo.businComplaint" placeholder="璇疯緭鍏ヨ缁嗗湴鍧�"></el-input>
+ </el-form-item>
+ <el-form-item label-width="120px" label="瀹為獙瀹よ仈绯讳汉" style="width: 49%">
+ <el-input v-model="dataForm.testAgencyInfo.laborContact" placeholder="璇疯緭鍏ヨ缁嗗湴鍧�"></el-input>
+ </el-form-item>
+ <el-form-item label-width="120px" label="瀹為獙瀹よ仈绯荤數璇�" style="width: 49%">
+ <el-input v-model="dataForm.testAgencyInfo.labContactNum" placeholder="璇疯緭鍏ヨ缁嗗湴鍧�"></el-input>
+ </el-form-item>
+ <el-form-item label-width="120px" label="閭斂缂栫爜" style="width: 49%">
+ <el-input v-model="dataForm.testAgencyInfo.postalCode" placeholder="璇疯緭鍏ヨ缁嗗湴鍧�"></el-input>
+ </el-form-item>
+ <el-form-item label-width="120px" label="浼犵湡" style="width: 49%">
+ <el-input v-model="dataForm.testAgencyInfo.fax" placeholder="璇疯緭鍏ヨ缁嗗湴鍧�"></el-input>
+ </el-form-item>
+ <el-form-item label-width="120px" label="鍦板潃" style="width: 98%">
+ <el-input v-model="dataForm.testAgencyInfo.site" placeholder="璇疯緭鍏ヨ缁嗗湴鍧�"></el-input>
+ </el-form-item>
+ <el-form-item label-width="120px" label="涓氬姟鎶曡瘔" style="width: 98%">
+ <el-input v-model="dataForm.testAgencyInfo.businComplaint" placeholder="璇疯緭鍏ヨ缁嗗湴鍧�"></el-input>
+ </el-form-item>
+ </div>
+ </div>
+ <div class="el-flex">
+ <div class="DWidth DAlign DHold">
+ 鎵挎墭鏂圭瀛�:
+ </div>
+ <div class="" style="width: 100%;">
+ <div class="el-flex" style="height: 40px">
+ <div style="width: 50%">
+ <span>{{dataForm.write}}</span>
+ </div>
+ <div class="el-flex">
+ <div style="width: 120px;text-align: center">{{dataForm.year}}</div>骞�
+ <div style="width: 80px;text-align: center">{{dataForm.month}}</div>鏈�
+ <div style="width: 80px;text-align: center">{{dataForm.day}}</div>鏃�
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="el-flex">
+ <div class="DPadding3 DAlign DHold">
+ 璇存槑
+ </div>
+ <div class="el-border-left">
+ <div>
+ <span>
+ 1銆佽嫢鏃犵壒娈婅鏄庯紝瑙嗗悓瀹㈡埛纭鏈腑蹇冮噰鐢ㄧ殑鎶�鏈柟娉曘�佽瘉涔︾被鍨嬨�佸饱绾︽椂闄愬拰鏀惰垂鏍囧噯锛堝鎴疯嫢鏈夌壒娈婅姹傦紝璇蜂簨鍏堟彁鍑哄苟缁忓弻鏂瑰崗鍟嗙‘璁わ紝骞跺湪濮旀墭鍗曠壒娈婅姹傛爮涓敞鏄庯紝鎴栬�呴檮椤佃鏄庯級锛屽悓鏃舵娴嬫椿鍔ㄤ粎瀵规潵鏍疯礋璐ｃ��
+ </span>
+ </div>
+ <div>
+ <span>
+ 2銆佸鎵樺崟浣滀负鍙屾柟鍗忚鍜屽鎴锋彁鍙栫墿鍝佺殑鍑瘉锛岃瀹㈡埛璇︾粏濉啓鏍稿骞跺Ε鍠勪繚瀛樸��
+ </span>
+ </div>
+ </div>
+ </div>
+ </div>
+
</el-form>
+<!-- <el-form :model="dataForm" ref="dataForm" :disabled="dataForm.disabled" label-width="120px">-->
+<!-- <zt-form-item label="杩愯鐜" prop="optEnviron" rules="required">-->
+<!-- <el-input v-model="dataForm.optEnviron"></el-input>-->
+<!-- </zt-form-item>-->
+<!-- <zt-form-item label="缂栫▼璇█" prop="programLang" rules="required">-->
+<!-- <el-input v-model="dataForm.programLang"></el-input>-->
+<!-- </zt-form-item>-->
+<!-- <zt-form-item label="娴嬭瘯渚濇嵁" prop="testBasis" rules="required">-->
+<!-- <zt-dict v-model="dataForm.testBasis" dict="test_basis"></zt-dict>-->
+<!-- </zt-form-item>-->
+<!-- <zt-form-item label="娴嬭瘯绫诲瀷" prop="testType" rules="required">-->
+<!-- <zt-dict v-model="dataForm.testType" dict="test_type1"></zt-dict>-->
+<!-- </zt-form-item>-->
+<!-- <zt-form-item label="娴嬭瘯鏍囧噯" prop="testStandard" rules="required">-->
+<!-- <zt-dict v-model="dataForm.testStandard" dict="test_standard"></zt-dict>-->
+<!-- </zt-form-item>-->
+<!-- <zt-form-item label="寮�濮嬫棩鏈�" prop="startDate" rules="required">-->
+<!-- <el-input v-model="dataForm.startDate"></el-input>-->
+<!-- </zt-form-item>-->
+<!-- <zt-form-item label="缁撴潫鏃ユ湡" prop="endDate" rules="required">-->
+<!-- <el-input v-model="dataForm.endDate"></el-input>-->
+<!-- </zt-form-item>-->
+<!-- <zt-form-item label="娴嬭瘯鍦哄湴" prop="testVenue" rules="required">-->
+<!-- <el-input v-model="dataForm.testVenue"></el-input>-->
+<!-- </zt-form-item>-->
+<!-- <zt-form-item label="鍏朵粬瑕佹眰" prop="otherRequire" rules="required">-->
+<!-- <el-input v-model="dataForm.otherRequire"></el-input>-->
+<!-- </zt-form-item>-->
+<!-- <zt-form-item label="娴嬭瘯鏃ユ湡" prop="testDate" rules="required">-->
+<!-- <el-input v-model="dataForm.testDate"></el-input>-->
+<!-- </zt-form-item>-->
+<!-- <zt-form-item label="浜や粯鏃ユ湡" prop="deliveryDate" rules="required">-->
+<!-- <el-input v-model="dataForm.deliveryDate"></el-input>-->
+<!-- </zt-form-item>-->
+<!-- <zt-form-item label="妫�娴嬭垂鐢�" prop="testCost" rules="required">-->
+<!-- <el-input v-model="dataForm.testCost"></el-input>-->
+<!-- </zt-form-item>-->
+<!-- <zt-form-item label="鐗╁搧鎬ц川" prop="articleNature" rules="required">-->
+<!-- <zt-dict v-model="dataForm.articleNature" dict="article_nature"></zt-dict>-->
+<!-- </zt-form-item>-->
+<!-- <zt-form-item label="鏍峰搧鐘舵��" prop="sampleStatus" rules="required">-->
+<!-- <el-input v-model="dataForm.sampleStatus"></el-input>-->
+<!-- </zt-form-item>-->
+<!-- <zt-form-item label="娴嬭瘎鏈烘瀯鍚嶇О" prop="agencyName" rules="required">-->
+<!-- <el-input v-model="dataForm.agencyName"></el-input>-->
+<!-- </zt-form-item>-->
+<!-- <zt-form-item label="鍦板潃" prop="site" rules="required">-->
+<!-- <el-input v-model="dataForm.site"></el-input>-->
+<!-- </zt-form-item>-->
+<!-- <zt-form-item label="涓氬姟鑱旂郴" prop="businContact" rules="required">-->
+<!-- <el-input v-model="dataForm.businContact"></el-input>-->
+<!-- </zt-form-item>-->
+<!-- <zt-form-item label="涓氬姟鎶曡瘔" prop="businComplaint" rules="required">-->
+<!-- <el-input v-model="dataForm.businComplaint"></el-input>-->
+<!-- </zt-form-item>-->
+<!-- <zt-form-item label="瀹為獙瀹よ仈绯讳汉" prop="laborContact" rules="required">-->
+<!-- <el-input v-model="dataForm.laborContact"></el-input>-->
+<!-- </zt-form-item>-->
+<!-- <zt-form-item label="瀹為獙瀹よ仈绯荤數璇�" prop="labContactNum" rules="required">-->
+<!-- <el-input v-model="dataForm.labContactNum"></el-input>-->
+<!-- </zt-form-item>-->
+<!-- <zt-form-item label="閭斂缂栫爜" prop="postalCode" rules="required">-->
+<!-- <el-input v-model="dataForm.postalCode"></el-input>-->
+<!-- </zt-form-item>-->
+<!-- <zt-form-item label="浼犵湡" prop="fax" rules="required">-->
+<!-- <el-input v-model="dataForm.fax"></el-input>-->
+<!-- </zt-form-item>-->
+<!-- </el-form>-->
</zt-dialog>
</template>
@@ -77,7 +451,36 @@
return {
dataForm: {
id: null,
- projectId: null
+ testAgencyInfo:{},
+ projectId: null,
+ project:{
+ code:'',
+ creator:'',
+ criticalLevel:'',
+ developUnitAddress:'',
+ developUnitContWay:'',
+ developUnitContact:'',
+ developUnitName:'',
+ disabled:'',
+ entrustUnitAddress:'',
+ entrustUnitContWay:'',
+ entrustUnitContact:'',
+ entrustUnitName:'',
+ identity:'',
+ isContract:'',
+ projectLeader:'',
+ projectReviewer:'',
+ projectTesters:'',
+ secretClass:'',
+ softwareName:'',
+ softwareType:'',
+ tenantId:'',
+ testLevel:'',
+
+ },
+ softwareTestOrder:{},
+ softwareTestOrderDeliverable:[],
+ softwareTestOrderMeasured:[],
}
}
},
@@ -89,14 +492,17 @@
projectId: this.dataForm.projectId
}
let res = await this.$http.get(`/project/SoftwareTestOrder/getDto`, {params: params})
- this.dataForm = {
- ...this.dataForm,
- ...res.data
+ if(res.data ){
+ this.dataForm = {
+ ...res.data
+ }
}
+
console.log(this.dataForm, "this.dataForm")
},
// 琛ㄥ崟鎻愪氦
async formSubmit() {
+ console.log(this.dataForm,' this.dataForm')
let res = await this.$http[!this.dataForm.id ? 'post' : 'put']('/project/SoftwareTestOrder/', this.dataForm)
if (res.success) {
await this.$tip.success()
@@ -107,3 +513,71 @@
}
}
</script>
+<style>
+.weiTuoDanAuto {
+ width: 70%;
+//border: 1px solid;
+ margin: 0 auto;
+}
+.weiTuoDanAuto .el-radio{
+ padding: 5px;
+}
+.zt .weiTuoDanAuto .el-form-item.el-form-item--default{
+ margin-right: 0;
+}
+.el-flex {
+ display: flex;
+ align-items: center;
+}
+
+.DWidth {
+ width: 100px;
+}
+
+.DWidth-Unt {
+ width: 100px;
+}
+.DPadding1{
+ padding: 6px;
+}
+.DPadding2{
+ padding: 7px;
+}
+.DPadding3{
+ padding: 4px;
+}
+.DAlign {
+ text-align: center;
+}
+.el-border-left{
+ border-left: 1px solid rgba(0,0,0,.2);
+}
+.DOldForm {
+ width: 100%;
+}
+.el-border-top-and-bottom{
+ border-top: 1px solid rgba(0,0,0,.2);
+ border-bottom: 1px solid rgba(0,0,0,.2);
+}
+.DOldForm > .el-form-item > .el-form-item__content {
+ width: calc(100% - 120px);
+}
+
+.el-border-bottom {
+ border-bottom: 1px solid rgba(0,0,0,.2);
+}
+
+.zt .el-table.el-software th {
+ background: transparent;
+}
+
+.zt .el-table.el-software th > .cell {
+ font-weight: 500;
+}
+.DHold{
+ font-weight: 600;
+}
+.zt .el-table.el-software{
+ font-size: 14px;
+}
+</style>
diff --git a/web/src/views/modules/project/SoftwareTestOrder.vue b/web/src/views/modules/project/SoftwareTestOrder.vue
index 4c42107..b985356 100644
--- a/web/src/views/modules/project/SoftwareTestOrder.vue
+++ b/web/src/views/modules/project/SoftwareTestOrder.vue
@@ -22,12 +22,12 @@
</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 type="selection" align="center" width="40"/>
<el-table-column prop="softwareName" label="杞欢鍚嶇О"/>
<el-table-column prop="code" label="椤圭洰缂栧彿"/>
<el-table-column prop="identity" label="椤圭洰鏍囪瘑"/>
<zt-table-column-dict prop="testBasis" label="娴嬭瘯渚濇嵁" dict="test_basis"/>
- <zt-table-column-dict prop="testStandard" label="娴嬭瘯鏍囧噯" dict="test_standard"/>
+ <zt-table-column-dict prop="testStandard" width="370px" label="娴嬭瘯鏍囧噯" dict="test_standard"/>
<zt-table-column-dict prop="articleNature" label="鐗╁搧鎬ц川" dict="article_nature"/>
<zt-table-column-handle :table="table" edit-perm="project:update" delete-perm="project::delete"/>
</el-table>
--
Gitblit v1.9.1