From d363e8168a9d821a87ff75406aec9a87ed19722a Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 22 十一月 2023 17:20:09 +0800
Subject: [PATCH] Changes
---
web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue | 111 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 64 insertions(+), 47 deletions(-)
diff --git a/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue b/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue
index 8d78aa6..c5eb523 100644
--- a/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue
+++ b/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue
@@ -3,7 +3,7 @@
<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>
+ <span>{{dataForm.circulatOrder.code}}</span>
</el-form-item>
</div>
<div style="border: 1px solid rgba(0,0,0,.2);width: 99%" >
@@ -12,16 +12,16 @@
<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-input v-model="dataForm.project.softwareIdentity" 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>
+ <zt-dict v-model="dataForm.project.softwareType" dict="is_embed_software" :radio="true"></zt-dict>
</el-form-item>
<el-form-item class="marginTopAndMarginBottom3" label="鐗╁搧缂栧彿" style="width: 32%">
- <el-input v-model="dataForm.testAgencyInfo.site" placeholder="鐗╁搧缂栧彿"></el-input>
+ <el-input v-model="dataForm.project.softwareIdentity" 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>
@@ -38,24 +38,39 @@
<span v-html="indexFormat(scope.$index)"></span>
</template>
</el-table-column>
- <el-table-column prop="name" min-width="300" label="杞欢椤瑰悕绉�">
+ <el-table-column prop="infoName" min-width="300" label="鎶�鏈祫鏂欏悕绉�">
<template v-slot="{ row }">
- <el-input v-model="row.itemName" placeholder="杞欢椤瑰悕绉�/鐗堟湰"></el-input>
+ <el-input v-model="row.infoName" placeholder="鎶�鏈祫鏂欏悕绉�"></el-input>
</template>
</el-table-column>
- <el-table-column prop="versions" align="center" width="180" label="鐗堟湰">
+ <el-table-column prop="identify" align="center" width="180" label="鏍囪瘑">
+ <template v-slot="{ row }">
+ <el-input v-model="row.identify" placeholder="鏍囪瘑"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column prop="version" 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="鐢ㄩ��">
+ <el-table-column prop="secretClass" label="瀵嗙骇" width="180" align="center">
<template v-slot="{ row }">
- <el-input v-model="row.purposes" placeholder="鐢ㄩ��"></el-input>
+ <el-input v-model="row.secretClass" placeholder="瀵嗙骇"></el-input>
</template>
</el-table-column>
- <el-table-column prop="unit" label="鎻愪緵鍗曚綅" width="180" align="center">
+ <el-table-column prop="medium" label="浠嬭川" width="180" align="center">
<template v-slot="{ row }">
- <el-input v-model="row.provideUnit" placeholder="鎻愪緵鍗曚綅"></el-input>
+ <el-input v-model="row.medium" placeholder="浠嬭川"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column prop="amount" label="鏁伴噺" width="180" align="center">
+ <template v-slot="{ row }">
+ <el-input v-model="row.amount" placeholder="鏁伴噺"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column prop="remark" label="澶囨敞" width="180" align="center">
+ <template v-slot="{ row }">
+ <el-input v-model="row.remark" placeholder="澶囨敞"></el-input>
</template>
</el-table-column>
</el-table>
@@ -73,54 +88,54 @@
<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"
+ <zt-dict v-model="dataForm.circulatOrder.itemRequire" :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-input v-model="dataForm.circulatOrder.itemOther"></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-input v-model="dataForm.circulatOrder.itemAccept" 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-input v-model="dataForm.circulatOrder.acceptDate" 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-input v-model="dataForm.circulatOrder.acceptSituation" 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-input v-model="dataForm.circulatOrder.calibratDetect" 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-input v-model="dataForm.circulatOrder.detectDate" 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-input v-model="dataForm.circulatOrder.detectSituation" 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-input v-model="dataForm.circulatOrder.warehouse" 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-input v-model="dataForm.circulatOrder.warehouseDate" 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-input v-model="dataForm.circulatOrder.warehouseSituation" 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-input v-model="dataForm.circulatOrder.itemIssue" 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-input v-model="dataForm.circulatOrder.issueDate" 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-input v-model="dataForm.circulatOrder.issueSituation" 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-input v-model="dataForm.circulatOrder.remark" placeholder="澶囨敞"></el-input>
</el-form-item>
</div>
</div>
@@ -134,20 +149,23 @@
return {
dataForm: {
id: '',
- url:'',
- environ:{
+ circulatOrder:{
code: '1',
- hardSoftwareRes: '',
- testEnvirontDiagram: '',
- establishStaff:'',
- establishDate:'',
- environAnalysis: '',
- environEstablish: '',
- environConfirmat: '',
- confirmatStaff: '',
- confirmatDate: '',
- isVirusScan: '',
- virusDatabaseVersion: '',
+ itemAccept: '',
+ itemRequire: '',
+ itemOther:'',
+ acceptSituation:'',
+ acceptDate: '',
+ calibratDetect: '',
+ detectDate: '',
+ detectSituation: '',
+ warehouse: '',
+ warehouseDate: '',
+ warehouseSituation: '',
+ itemIssue: '',
+ issueDate: '',
+ issueSituation: '',
+ remark: '',
},
project: {
softwareIdentity: '',
@@ -155,14 +173,8 @@
},
testAgencyInfo: {
agencyName:'',
- site:'',
},
- softwareTestOrder:{
- requireOther:'',
- },
- softwareResourcesList:[],
- hardwareResourcesList:[],
- environAnalysisList:[]
+ technicalList:[]
}
}
},
@@ -176,11 +188,16 @@
},
// 鑾峰彇淇℃伅
async getInfo() {
- let res = await this.$http.get(`/itemCirculatOrder/ItemCirculatOrder/${this.dataForm.id}`)
+ let params = {
+ circulatOrderid: this.dataForm.id,
+ projectId: this.dataForm.projectId
+ }
+ let res = await this.$http.get(`/itemCirculatOrder/ItemCirculatOrder/getDto`,{params: params})
this.dataForm = {
...this.dataForm,
...res.data
}
+ console.log(this.dataForm,"this.dataForm")
},
// 琛ㄥ崟鎻愪氦
async formSubmit() {
--
Gitblit v1.9.1