From 4a24c7fdeeb3c4979608dd9af80855ce66b8c58d Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期三, 22 十一月 2023 16:35:09 +0800
Subject: [PATCH] 项目表
---
web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue | 258 +++++++++++++++++++++++++++++++++++++--------------
1 files changed, 185 insertions(+), 73 deletions(-)
diff --git a/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue b/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue
index 534782c..8d78aa6 100644
--- a/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue
+++ b/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue
@@ -1,60 +1,129 @@
<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="椤圭洰ID" prop="projectId" rules="required">
- <el-input v-model="dataForm.projectId"></el-input>
- </zt-form-item>
- <zt-form-item label="鐗╁搧娴佽浆鍗曠紪鍙�" prop="code" rules="required">
- <el-input v-model="dataForm.code"></el-input>
- </zt-form-item>
- <zt-form-item label="鐗╁搧鍏朵粬瑕佹眰" prop="itemRequire" rules="required">
- <el-input v-model="dataForm.itemRequire"></el-input>
- </zt-form-item>
- <zt-form-item label="鐗╁搧鍏朵粬瑕佹眰鐨勫叾浠�" prop="itemOther" rules="required">
- <el-input v-model="dataForm.itemOther"></el-input>
- </zt-form-item>
- <zt-form-item label="鐗╁搧鎺ユ敹浜�" prop="itemAccept" rules="required">
- <el-input v-model="dataForm.itemAccept"></el-input>
- </zt-form-item>
- <zt-form-item label="鐗╁搧鎺ユ敹鏃堕棿" prop="acceptDate" rules="required">
- <el-input v-model="dataForm.acceptDate"></el-input>
- </zt-form-item>
- <zt-form-item label="鐗╁搧鎺ユ敹鎯呭喌璇存槑" prop="acceptSituation" rules="required">
- <el-input v-model="dataForm.acceptSituation"></el-input>
- </zt-form-item>
- <zt-form-item label="鏍″噯妫�娴嬩汉" prop="calibratDetect" rules="required">
- <el-input v-model="dataForm.calibratDetect"></el-input>
- </zt-form-item>
- <zt-form-item label="鏍″噯妫�娴嬫椂闂�" prop="detectDate" rules="required">
- <el-input v-model="dataForm.detectDate"></el-input>
- </zt-form-item>
- <zt-form-item label="鏍″噯妫�娴嬫儏鍐佃鏄�" prop="detectSituation" rules="required">
- <el-input v-model="dataForm.detectSituation"></el-input>
- </zt-form-item>
- <zt-form-item label="鐗╁搧鍏ュ簱浜�" prop="warehouse" rules="required">
- <el-input v-model="dataForm.warehouse"></el-input>
- </zt-form-item>
- <zt-form-item label="鐗╁搧鍏ュ簱鏃堕棿" prop="warehouseDate" rules="required">
- <el-input v-model="dataForm.warehouseDate"></el-input>
- </zt-form-item>
- <zt-form-item label="鐗╁搧鍏ュ簱鎯呭喌" prop="warehouseSituation" rules="required">
- <el-input v-model="dataForm.warehouseSituation"></el-input>
- </zt-form-item>
- <zt-form-item label="鐗╁搧鍙戞斁浜�" prop="itemIssue" rules="required">
- <el-input v-model="dataForm.itemIssue"></el-input>
- </zt-form-item>
- <zt-form-item label="鐗╁搧鍙戞斁鏃堕棿" prop="issueDate" rules="required">
- <el-input v-model="dataForm.issueDate"></el-input>
- </zt-form-item>
- <zt-form-item label="鐗╁搧鍙戞斁鎯呭喌璇存槑" prop="issueSituation" rules="required">
- <el-input v-model="dataForm.issueSituation"></el-input>
- </zt-form-item>
- <zt-form-item label="澶囨敞" prop="remark" rules="required">
- <el-input v-model="dataForm.remark"></el-input>
- </zt-form-item>
- <zt-form-item label="骞翠唤" prop="year" rules="required">
- <el-input v-model="dataForm.year"></el-input>
- </zt-form-item>
+ <el-form :model="dataForm" :inline="true" ref="dataForm" style="padding-top: 0" :disabled="dataForm.disabled" label-width="120px" class="circulationFormAuto">
+ <div class="">
+ <el-form-item label-width="60px" label="缂栧彿:" style="width:100%;margin-bottom: -5px">
+ <span>{{dataForm.environ.code}}</span>
+ </el-form-item>
+ </div>
+ <div style="border: 1px solid rgba(0,0,0,.2);width: 99%" >
+ <div style="border-bottom: 1px solid rgba(0,0,0,.2);" class="circulationContentWidth">
+ <el-form-item class="marginTopAndMarginBottom" label="涓撲笟瀹為獙瀹�" style="width: 32%">
+ <el-input v-model="dataForm.testAgencyInfo.agencyName" placeholder="涓撲笟瀹為獙瀹�"></el-input>
+ </el-form-item>
+ <el-form-item class="marginTopAndMarginBottom" label="浠诲姟缂栧彿" style="width: 32%">
+ <el-input v-model="dataForm.testAgencyInfo.site" placeholder="浠诲姟缂栧彿"></el-input>
+ </el-form-item>
+ <el-form-item class="marginTopAndMarginBottom" label="鐗╁搧鍚嶇О" style="width: 32%">
+ <el-input v-model="dataForm.project.softwareName" placeholder="鐗╁搧鍚嶇О"></el-input>
+ </el-form-item>
+ <el-form-item class="marginTopAndMarginBottom3" label="鍨嬪彿" style="width: 32%">
+ <el-input v-model="dataForm.testAgencyInfo.agencyName" placeholder="鍨嬪彿"></el-input>
+ </el-form-item>
+ <el-form-item class="marginTopAndMarginBottom3" label="鐗╁搧缂栧彿" style="width: 32%">
+ <el-input v-model="dataForm.testAgencyInfo.site" placeholder="鐗╁搧缂栧彿"></el-input>
+ </el-form-item>
+ <el-form-item class="marginTopAndMarginBottom3" label="鏁� 閲�" style="width: 32%">
+ <el-input v-model="dataForm.project.softwareName" placeholder="鏁伴噺"></el-input>
+ </el-form-item>
+ </div>
+ <div style="border-bottom: 1px solid rgba(0,0,0,.2);">
+ <div style="padding-left:5px;padding-right:5px;">
+ <div style="padding: 5px">鐗╁搧鎶�鏈祫鏂欏強鏁伴噺锛�</div>
+ <div class="table-container">
+ <el-table ref="tableSoftwareList" class="el-software el-margin-top-bot" border :data="dataForm.softwareResourcesList"
+ stripe>
+ <el-table-column prop="no" align="center" width="80" label="搴忓彿">
+ <template slot-scope="scope">
+ <span v-html="indexFormat(scope.$index)"></span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="name" min-width="300" label="杞欢椤瑰悕绉�">
+ <template v-slot="{ row }">
+ <el-input v-model="row.itemName" placeholder="杞欢椤瑰悕绉�/鐗堟湰"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column prop="versions" align="center" width="180" label="鐗堟湰">
+ <template v-slot="{ row }">
+ <el-input v-model="row.version" placeholder="鐗堟湰"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column prop="purposes" align="center" width="180" label="鐢ㄩ��">
+ <template v-slot="{ row }">
+ <el-input v-model="row.purposes" placeholder="鐢ㄩ��"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column prop="unit" label="鎻愪緵鍗曚綅" width="180" align="center">
+ <template v-slot="{ row }">
+ <el-input v-model="row.provideUnit" placeholder="鎻愪緵鍗曚綅"></el-input>
+ </template>
+ </el-table-column>
+ </el-table>
+<!-- <div class="icon-container" @click="addSoftwareRow()">-->
+<!-- <!– 鏀剧疆鍥哄畾鐨勫浘鏍� –>-->
+<!-- <i class="el-icon-plus"></i>-->
+<!-- </div>-->
+ </div>
+ </div>
+ </div>
+ <div class="el-flexCirculationDialog el-border-bottom">
+ <div class="DHold">
+ 鐗╁搧鐨勫叾瀹冭姹�
+ </div>
+ <div style="width: calc(100% - 120px);">
+ <div class="el-border-left">
+ <el-form-item label="鐗╁搧鏄惁闇�瑕佽繑杩�" label-width="150px" style="width:100%;padding-left:5%;margin-bottom:0">
+ <zt-dict v-model="dataForm.softwareTestOrder.otherRequire" :radio="true"
+ dict="is_or_not"></zt-dict>
+ </el-form-item>
+ <el-form-item label="鐗╁搧鐨勫叾浠栬姹傦細" label-width="150px" style="width:100%;padding-left:5%;margin-bottom:0">
+ <el-input v-model="dataForm.softwareTestOrder.requireOther"></el-input>
+ </el-form-item>
+ </div>
+ </div>
+ </div>
+ <div class="circulationContentWidth">
+ <el-form-item class="marginTopAndMarginBottom" label="鐗╁搧鎺ユ敹浜�" style="width: 32%">
+ <el-input v-model="dataForm.testAgencyInfo.agencyName" placeholder="鐗╁搧鎺ユ敹浜�"></el-input>
+ </el-form-item>
+ <el-form-item class="marginTopAndMarginBottom" label="鏃堕棿" style="width: 32%">
+ <el-input v-model="dataForm.testAgencyInfo.site" placeholder="鏃堕棿"></el-input>
+ </el-form-item>
+ <el-form-item class="marginTopAndMarginBottom" label="鎯呭喌璇存槑" style="width: 32%">
+ <el-input v-model="dataForm.project.softwareName" placeholder="鎯呭喌璇存槑"></el-input>
+ </el-form-item>
+ <el-form-item class="marginTopAndMarginBottom3" label="鏍″噯妫�娴嬩汉" style="width: 32%">
+ <el-input v-model="dataForm.testAgencyInfo.agencyName" placeholder="鏍″噯妫�娴嬩汉"></el-input>
+ </el-form-item>
+ <el-form-item class="marginTopAndMarginBottom3" label="鏃堕棿" style="width: 32%">
+ <el-input v-model="dataForm.testAgencyInfo.site" placeholder="鏃堕棿"></el-input>
+ </el-form-item>
+ <el-form-item class="marginTopAndMarginBottom3" label="鎯呭喌璇存槑" style="width: 32%">
+ <el-input v-model="dataForm.project.softwareName" placeholder="鎯呭喌璇存槑"></el-input>
+ </el-form-item>
+ <el-form-item class="marginTopAndMarginBottom2" label="鐗╁搧鍏ュ簱浜�" style="width: 32%">
+ <el-input v-model="dataForm.testAgencyInfo.agencyName" placeholder="鐗╁搧鍏ュ簱浜�"></el-input>
+ </el-form-item>
+ <el-form-item class="marginTopAndMarginBottom2" label="鏃堕棿" style="width: 32%">
+ <el-input v-model="dataForm.testAgencyInfo.site" placeholder="鏃堕棿"></el-input>
+ </el-form-item>
+ <el-form-item class="marginTopAndMarginBottom2" label="鎯呭喌璇存槑" style="width: 32%">
+ <el-input v-model="dataForm.project.softwareName" placeholder="鎯呭喌璇存槑"></el-input>
+ </el-form-item>
+ <el-form-item class="marginTopAndMarginBottom2" label="鐗╁搧鍙戞斁浜�" style="width: 32%">
+ <el-input v-model="dataForm.testAgencyInfo.agencyName" placeholder="鐗╁搧鍙戞斁浜�"></el-input>
+ </el-form-item>
+ <el-form-item class="marginTopAndMarginBottom2" label="鏃堕棿" style="width: 32%">
+ <el-input v-model="dataForm.testAgencyInfo.site" placeholder="鏃堕棿"></el-input>
+ </el-form-item>
+ <el-form-item class="marginTopAndMarginBottom2" label="鎯呭喌璇存槑" style="width: 32%">
+ <el-input v-model="dataForm.project.softwareName" placeholder="鎯呭喌璇存槑"></el-input>
+ </el-form-item>
+ <el-form-item class="marginTopAndMarginBottom2 lastChild" label="澶囨敞" style="width: 100%">
+ <el-input v-model="dataForm.testAgencyInfo.agencyName" placeholder="澶囨敞"></el-input>
+ </el-form-item>
+ </div>
+ </div>
</el-form>
</zt-dialog>
</template>
@@ -65,28 +134,46 @@
return {
dataForm: {
id: '',
- projectId: '',
- code: '',
- itemRequire: '',
- itemOther: '',
- itemAccept: '',
- acceptDate: '',
- acceptSituation: '',
- calibratDetect: '',
- detectDate: '',
- detectSituation: '',
- warehouse: '',
- warehouseDate: '',
- warehouseSituation: '',
- itemIssue: '',
- issueDate: '',
- issueSituation: '',
- remark: '',
- year: ''
+ url:'',
+ environ:{
+ code: '1',
+ hardSoftwareRes: '',
+ testEnvirontDiagram: '',
+ establishStaff:'',
+ establishDate:'',
+ environAnalysis: '',
+ environEstablish: '',
+ environConfirmat: '',
+ confirmatStaff: '',
+ confirmatDate: '',
+ isVirusScan: '',
+ virusDatabaseVersion: '',
+ },
+ project: {
+ softwareIdentity: '',
+ softwareName: '',
+ },
+ testAgencyInfo: {
+ agencyName:'',
+ site:'',
+ },
+ softwareTestOrder:{
+ requireOther:'',
+ },
+ softwareResourcesList:[],
+ hardwareResourcesList:[],
+ environAnalysisList:[]
}
}
},
methods: {
+ init(id,row){
+ this.dataForm.id = row.id
+ this.dataForm.projectId = row.projectId
+ // this.dataForm.disabled
+ this.getInfo()
+ console.log(this.dataForm.id,this.dataForm.projectId,'params params')
+ },
// 鑾峰彇淇℃伅
async getInfo() {
let res = await this.$http.get(`/itemCirculatOrder/ItemCirculatOrder/${this.dataForm.id}`)
@@ -107,3 +194,28 @@
}
}
</script>
+<style>
+.el-flexCirculationDialog{
+ display: flex;
+ align-items: center
+}
+.circulationContentWidth > .el-form-item > .el-form-item__content {
+ width: calc(100% - 120px);
+}
+.circulationContentWidth > .el-form-item.lastChild > .el-form-item__content {
+ width: calc(100% - 142px);
+}
+.circulationFormAuto .marginTopAndMarginBottom {
+ margin-top: 10px !important;
+ margin-bottom: 0 !important;
+}
+
+.circulationFormAuto .marginTopAndMarginBottom2 {
+ margin-top: -10px !important;
+ margin-bottom: 10px !important;
+}
+.circulationFormAuto .marginTopAndMarginBottom3 {
+ margin-top: 0 !important;
+ margin-bottom: 10px !important;
+}
+</style>
--
Gitblit v1.9.1