From d7484d4ec7a94b71504caeca4fab765834854686 Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期一, 13 十一月 2023 14:18:49 +0800
Subject: [PATCH] 项目表
---
web/src/views/modules/project/SoftwareTestOrder.vue | 2
web/src/commonJS/common.js | 10 ++++
web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue | 107 ++++++++++++++++++++++++++++++++++-------------------
3 files changed, 79 insertions(+), 40 deletions(-)
diff --git a/web/src/commonJS/common.js b/web/src/commonJS/common.js
index 1b4b8a9..4d88452 100644
--- a/web/src/commonJS/common.js
+++ b/web/src/commonJS/common.js
@@ -112,6 +112,13 @@
return t;
}
+function getYearMonDay(date){
+ const dateObject = new Date(date);
+ let year = dateObject.getFullYear();
+ let month = dateObject.getMonth() + 1;
+ let day = dateObject.getDate();
+ return {year,month,day}
+}
// tabs, 鍒犻櫎tab
function removeTabHandle(that) {
let tabName = that.$route.name
@@ -185,5 +192,6 @@
formatDate,
formatDate2,
getShowColumns,
- setHartBeat
+ setHartBeat,
+ getYearMonDay
}
diff --git a/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue b/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
index 12c828e..0b1b9f6 100644
--- a/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
+++ b/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
@@ -1,8 +1,8 @@
<template>
<zt-dialog ref="dialog" column="2" @confirm="formSubmit">
- <el-form ref="form" :inline="true" :model="dataForm" label-width="120px" class="weiTuoDanAuto">
+ <el-form ref="form" :inline="true" :model="dataForm" :disabled="dataForm.disabled" label-width="120px" class="weiTuoDanAuto">
<div class="DManageForm">
- <el-form-item label-width="60px" label="缂栧彿:" style="width: 99%">
+ <el-form-item readonly label-width="60px" label="缂栧彿:" style="width: 99%">
<span>{{dataForm.project.code}}</span>
</el-form-item>
</div>
@@ -18,20 +18,20 @@
</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 label="鍗曚綅鍚嶇О" style="width: 49%">
+ <el-input readonly 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 label="鑱旂郴浜�" style="width: 49%">
+ <el-input readonly 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-input readonly 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-input readonly v-model="dataForm.project.entrustUnitContWay" placeholder="璇疯緭鍏ヨ仈绯绘柟寮�"></el-input>
</el-form-item>
</div>
</div>
@@ -42,19 +42,19 @@
<div class="DOldForm el-border-left">
<!-- 鍗曚綅鍚嶇О -->
<el-form-item label="鍗曚綅鍚嶇О" style="width: 49%">
- <el-input v-model="dataForm.project.developUnitName" placeholder="璇疯緭鍏ュ崟浣嶅悕绉�"></el-input>
+ <el-input readonly 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-input readonly 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-input readonly 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-input readonly v-model="dataForm.project.developUnitContWay" placeholder="璇疯緭鍏ヨ仈绯绘柟寮�"></el-input>
</el-form-item>
</div>
</div>
@@ -65,25 +65,25 @@
<div class="DOldForm el-border-left">
<!-- 鍗曚綅鍚嶇О -->
<el-form-item label="杞欢鍚嶇О" style="width: 49%">
- <el-input v-model="dataForm.project.softwareName" placeholder="璇疯緭鍏ヨ蒋浠跺悕绉�"></el-input>
+ <el-input readonly 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-input readonly 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>
+ <zt-dict readonly 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>
+ <zt-dict readonly 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-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>
@@ -93,17 +93,19 @@
琚祴浠跺強鍏朵粬鐩稿叧鐗╁搧娓呭崟
</div>
<div style="width: calc(100% - 120px);padding: 5px">
- <el-table class="el-software" height="230" border :data="dataForm.softwareTestOrderMeasured"
+ <el-table class="el-software" height="230" border :data="dataForm.softwareTestOrderMeasuredList"
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 type="index" align="center" width="80" label="搴忓彿"/>
+ <el-table-column prop="dictLabel" 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>
+ <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>
@@ -190,11 +192,19 @@
</div>
<div class="DOldForm">
<el-form-item label="寮�濮嬫棩鏈�" style="width: 49%">
- <el-input v-model="dataForm.softwareTestOrder.startDate" placeholder="璇疯緭鍏ュ崟浣嶅悕绉�"></el-input>
+ <el-date-picker
+ v-model="dataForm.softwareTestOrder.startDate"
+ type="date"
+ placeholder="閫夋嫨鏃ユ湡">
+ </el-date-picker>
</el-form-item>
<!-- 鑱旂郴浜� -->
<el-form-item label="缁撴潫鏃ユ湡" style="width: 49%">
- <el-input v-model="dataForm.softwareTestOrder.endDate" placeholder="璇疯緭鍏ヨ仈绯讳汉"></el-input>
+ <el-date-picker
+ v-model="dataForm.softwareTestOrder.endDate"
+ type="date"
+ placeholder="閫夋嫨鏃ユ湡">
+ </el-date-picker>
</el-form-item>
</div>
<div class="DOldForm el-border-bottom">
@@ -245,11 +255,19 @@
<div class="DOldForm el-border-left">
<!-- 鍗曚綅鍚嶇О -->
<el-form-item label="娴嬭瘯鏃ユ湡" style="width: 49%">
- <el-input v-model="dataForm.softwareTestOrder.testDate" placeholder="璇疯緭鍏ユ祴璇曟棩鏈�"></el-input>
+ <el-date-picker
+ v-model="dataForm.softwareTestOrder.testDate"
+ type="date"
+ placeholder="娴嬭瘯鏃ユ湡">
+ </el-date-picker>
</el-form-item>
<!-- 鑱旂郴浜� -->
<el-form-item label="浜や粯鏃ユ湡" style="width: 49%">
- <el-input v-model="dataForm.softwareTestOrder.deliveryDate" placeholder="璇疯緭鍏ヤ氦浠樻棩鏈�"></el-input>
+ <el-date-picker
+ v-model="dataForm.softwareTestOrder.deliveryDate"
+ type="date"
+ placeholder="浜や粯鏃ユ湡">
+ </el-date-picker>
</el-form-item>
<!-- 璇︾粏鍦板潃 -->
<el-form-item label="妫�娴嬭垂鐢�" style="width: 98%">
@@ -286,10 +304,10 @@
浜や粯鐗╂竻鍗�
</div>
<div style="width: calc(100% - 120px);padding: 5px">
- <el-table class="el-software" height="230" border :data="dataForm.softwareTestOrderDeliverable"
+ <el-table class="el-software" height="230" border :data="dataForm.softwareTestOrderDeliverableList"
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 type="index" align="center" width="80" label="搴忓彿"/>
+ <el-table-column prop="dictLabel" min-width="300" label="鍚嶇О"></el-table-column>
<el-table-column prop="identify" align="center" width="380" label="鏍囪瘑/鐗堟湰"></el-table-column>
</el-table>
</div>
@@ -345,9 +363,9 @@
<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 style="width: 120px;text-align: center">{{getYear}}</div>骞�
+ <div style="width: 80px;text-align: center">{{getMon}}</div>鏈�
+ <div style="width: 80px;text-align: center">{{getDay}}</div>鏃�
</div>
</div>
</div>
@@ -446,9 +464,11 @@
</template>
<script>
+ import {getYearMonDay} from '@/commonJS/common'
export default {
data() {
return {
+ time:'2023-11-13',
dataForm: {
id: null,
testAgencyInfo:{},
@@ -461,7 +481,6 @@
developUnitContWay:'',
developUnitContact:'',
developUnitName:'',
- disabled:'',
entrustUnitAddress:'',
entrustUnitContWay:'',
entrustUnitContact:'',
@@ -479,12 +498,24 @@
},
softwareTestOrder:{},
- softwareTestOrderDeliverable:[],
- softwareTestOrderMeasured:[],
+ softwareTestOrderDeliverableList:[],
+ softwareTestOrderMeasuredList:[],
}
}
},
+ computed:{
+ getYear(){
+ return getYearMonDay(this.time).year
+ },
+ getMon(){
+ return getYearMonDay(this.time).month
+ },
+ getDay(){
+ return getYearMonDay(this.time).day
+ },
+ },
methods: {
+ getYearMonDay,
// 鑾峰彇淇℃伅
async getInfo() {
let params = {
diff --git a/web/src/views/modules/project/SoftwareTestOrder.vue b/web/src/views/modules/project/SoftwareTestOrder.vue
index b985356..3dcf16e 100644
--- a/web/src/views/modules/project/SoftwareTestOrder.vue
+++ b/web/src/views/modules/project/SoftwareTestOrder.vue
@@ -24,7 +24,7 @@
<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" align="center" width="40"/>
<el-table-column prop="softwareName" label="杞欢鍚嶇О"/>
- <el-table-column prop="code" 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" width="370px" label="娴嬭瘯鏍囧噯" dict="test_standard"/>
--
Gitblit v1.9.1