From d660ed580c4ac9e5b2cb063a7a12c392405813f5 Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期二, 21 十一月 2023 09:34:39 +0800
Subject: [PATCH] 项目表
---
web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue | 44 +++++++++++++++++++++++++-------------------
1 files changed, 25 insertions(+), 19 deletions(-)
diff --git a/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue b/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
index 8ea3e84..f6f85c3 100644
--- a/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
+++ b/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
@@ -1,6 +1,6 @@
<template>
<zt-dialog ref="dialog" column="2" @confirm="formSubmit">
- <el-form ref="form" :inline="true" :model="dataForm" :disabled="dataForm.disabled" label-width="120px"
+ <el-form ref="form" :inline="true" :model="dataForm" :disabled="dataForm.disabled" label-width="93px"
class="weiTuoDanAuto" style="padding-top: 0">
<div class="DManageForm">
<el-form-item readonly label-width="50px" label="缂栧彿:" style="width: 99% ;margin-bottom:-5px">
@@ -66,7 +66,7 @@
</div>
</div>
<div class="el-flex el-border-bottom">
- <div class="DWidth-Unt DAlign DHold">
+ <div class="DWidth-Unt DAlign DHold">
琚祴浠朵俊鎭�
</div>
<div class="DOldForm el-border-left">
@@ -98,7 +98,7 @@
<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 style="width:88px !important;" class="DWidth DAlign DHold">
琚祴浠跺強鍏朵粬鐩稿叧鐗╁搧娓呭崟
</div>
<div style="width: calc(100% - 120px);padding: 5px">
@@ -106,11 +106,7 @@
@cell-click="handleCellClick"
stripe>
<el-table-column prop="no" 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="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">
@@ -230,15 +226,16 @@
<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>-->
+ <zt-select v-model="dataForm.softwareTestOrder.entrustSign" url="/sys/userEx/getUsersList" :multiple="true" :clearable="true" placeholder="濮旀墭鏂逛汉鍛�"/>
</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>
- 鏃�
+ <el-date-picker
+ v-model="dataForm.softwareTestOrder.entrustSignDate"
+ type="date"
+ placeholder="閫夋嫨鏃ユ湡">
+ </el-date-picker>
+<!-- {{ dataForm.softwareTestOrder.entrustSignDate | filterTime('YYYY骞碝M鏈圖D鏃�') }}-->
</div>
</div>
</div>
@@ -288,7 +285,7 @@
</div>
</div>
<div class="el-flex el-border-top">
- <div class="DWidth DAlign DHold">
+ <div style="width:88px !important;" class="DWidth DAlign DHold">
浜や粯鐗╂竻鍗�
</div>
<div style="width: calc(100% - 120px);padding: 5px">
@@ -351,10 +348,16 @@
<div class="" style="width: 100%;">
<div class="el-flex" style="height: 40px">
<div style="width: 70%">
- <span>{{ dataForm.write }}</span>
+ <zt-select v-model="dataForm.softwareTestOrder.contractSign" url="/sys/userEx/getUsersList" :multiple="true" :clearable="true" placeholder="鎵挎墭鏂逛汉鍛�"/>
+<!-- <span>{{ dataForm.contractSign }}</span>-->
</div>
<div class="el-flex">
- {{ dataForm.softwareTestOrder.deliveryDate | filterTime('YYYY骞碝M鏈圖D鏃�') }}
+<!-- {{ dataForm.softwareTestOrder.contractSignDate | filterTime('YYYY骞碝M鏈圖D鏃�') }}-->
+ <el-date-picker
+ v-model="dataForm.softwareTestOrder.contractSignDate"
+ type="date"
+ placeholder="閫夋嫨鏃ユ湡">
+ </el-date-picker>
</div>
</div>
</div>
@@ -424,6 +427,10 @@
testCost:'',
articleNature:'',
sampleStatus:'',
+ entrustSign:'',
+ entrustSignDate:'',
+ contractSign:'',
+ contractSignDate:''
},
project: {
code: '',
@@ -447,7 +454,6 @@
softwareType: '',
tenantId: '',
testLevel: '',
-
},
testAgencyInfo: {
agencyName:'',
--
Gitblit v1.9.1