From b21945e7dea2daa8b30bee3cdd4bca91277e3b5f Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 29 十一月 2023 09:22:17 +0800
Subject: [PATCH] 6
---
web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue | 251 +++++++++++++++++++++++++-------------------------
1 files changed, 125 insertions(+), 126 deletions(-)
diff --git a/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue b/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue
index be72b12..0a1b4af 100644
--- a/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue
+++ b/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue
@@ -1,12 +1,13 @@
<template>
- <zt-dialog ref="dialog" column="3" @confirm="formSubmit">
- <el-form :model="dataForm" :inline="true" ref="dataForm" style="padding-top: 0" :disabled="dataForm.disabled" label-width="120px" class="circulationFormAuto">
+ <zt-dialog ref="dialog" column="3" :title="title" :stepMarker="stepMarker" @confirm="formSubmit">
+ <el-form :model="dataForm" :inline="true" ref="dataForm" style="padding-top: 0" :disabled="dataForm.disabled"
+ label-width="120px" class="circulationFormAuto">
<div>
<el-form-item label-width="60px" label="缂栧彿:" style="width:100%;margin-bottom: -5px">
<span>{{dataForm.circulatOrder.code}}</span>
</el-form-item>
</div>
- <div style="border: 1px solid rgba(0,0,0,.2);width: 99%" >
+ <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>
@@ -31,7 +32,8 @@
<div style="padding-left:5px;padding-right:5px;">
<div style="padding: 5px">鐗╁搧鎶�鏈祫鏂欏強鏁伴噺锛�</div>
<div class="table-container">
- <el-table ref="tableCirculatOrderList" class="el-software el-margin-top-bot" border :data="dataForm.technicalList"
+ <el-table ref="tableCirculatOrderList" class="el-software el-margin-top-bot" border
+ :data="dataForm.technicalList"
stripe>
<el-table-column prop="no" align="center" width="60" label="搴忓彿">
<template slot-scope="scope">
@@ -53,30 +55,30 @@
<el-input v-model="row.identify" placeholder="鐗堟湰"></el-input>
</template>
</el-table-column>
- <el-table-column prop="secretClass" label="瀵嗙骇" width="100" align="center">
+ <el-table-column prop="secretClass" label="瀵嗙骇" width="100" align="center">
<template v-slot="{ row }">
-<!-- <el-input v-model="row.secretClass" placeholder="瀵嗙骇"></el-input>-->
+ <!-- <el-input v-model="row.secretClass" placeholder="瀵嗙骇"></el-input>-->
<zt-dict v-model="row.secretClass" dict="secret_class"></zt-dict>
</template>
</el-table-column>
- <el-table-column prop="medium" label="浠嬭川" width="100" align="center">
+ <el-table-column prop="medium" label="浠嬭川" width="100" align="center">
<template v-slot="{ row }">
<el-input v-model="row.medium" placeholder="浠嬭川"></el-input>
</template>
</el-table-column>
- <el-table-column prop="amount" label="鏁伴噺" width="80" align="center">
+ <el-table-column prop="amount" label="鏁伴噺" width="80" 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="100" align="center">
+ <el-table-column prop="remark" label="澶囨敞" width="100" align="center">
<template v-slot="{ row }">
<el-input v-model="row.remark" placeholder="澶囨敞"></el-input>
</template>
</el-table-column>
- <el-table-column fixed="right" prop="files" label="涓婁紶闄勪欢" width="300" align="center">
+ <el-table-column fixed="right" prop="files" label="涓婁紶闄勪欢" width="300" align="center">
<template v-slot="{ row }">
-<!-- <zt-table-button @click="files(row.id)">涓婁紶闄勪欢</zt-table-button>-->
+ <!-- <zt-table-button @click="files(row.id)">涓婁紶闄勪欢</zt-table-button>-->
<table-uploader busi-type="circulat_order" model-name="row" :dataForm="row"
v-model="row.files"/>
</template>
@@ -94,7 +96,7 @@
鐗╁搧鐨勫叾瀹冭姹�
</div>
<div style="width: calc(100% - 120px);">
- <div class="el-border-left">
+ <div class="el-border-left">
<el-form-item label="鐗╁搧鏄惁闇�瑕佽繑杩�" label-width="150px" style="width:100%;padding-left:20px;margin-bottom:0">
<zt-dict v-model="dataForm.circulatOrder.itemRequire" :radio="true"
dict="is_or_not"></zt-dict>
@@ -110,15 +112,15 @@
鐗╁搧鎺ユ敹浜�
</div>
<div class="el-border-left-right acceptDate" style="width: 20%;;height: 80px;">
- <el-form-item style="width: 100%;padding-left:20px;margin:0;">
- {{dataForm.circulatOrder.itemAccept}}
+ <el-form-item style="width: 100%;padding-left:20px;margin:0;">
+ {{dataForm.circulatOrder.itemAcceptor}}
</el-form-item>
</div>
<div style="width: 52px;text-align: center;font-weight: 600">
鏃堕棿
</div>
<div class="el-border-left-right acceptDate" style="width: 20%;height: 80px;">
- <el-form-item style="width: 100%;padding-left:20px;margin:0;">
+ <el-form-item style="width: 100%;padding-left:20px;margin:0;">
{{dataForm.circulatOrder.acceptDate}}
</el-form-item>
</div>
@@ -130,16 +132,16 @@
<zt-dict v-model="dataForm.circulatOrder.acceptSituation" :radio="true" dict="is_or_not"></zt-dict>
</el-form-item>
<el-form-item label="鐥呮瘨搴撶増鏈細" label-width="150px" style="width:100%;padding-left:20px;margin-bottom:0">
- <el-input v-model="dataForm.circulatOrder.itemOther"></el-input>
+ <el-input v-model="dataForm.circulatOrder.virusLibraryVersion"></el-input>
</el-form-item>
</div>
</div>
- <div class="el-flexCirculationDialog el-border-bottom">
+ <!--<div class="el-flexCirculationDialog el-border-bottom">
<div style="width: 112px;text-align: center;font-weight: 600">
鏍″噯/妫�娴嬫帴鏀朵汉
</div>
<div class="el-border-left-right" style="width: 20%;height: 40px;">
- <el-form-item style="width: 100%;padding-left:20px;margin:0;">
+ <el-form-item style="width: 100%;padding-left:20px;margin:0;">
{{dataForm.circulatOrder.itemAccept}}
</el-form-item>
</div>
@@ -147,7 +149,7 @@
鏃堕棿
</div>
<div class="el-border-left-right" style="width: 20%;height: 40px;">
- <el-form-item style="width: 100%;padding-left:20px;margin:0;">
+ <el-form-item style="width: 100%;padding-left:20px;margin:0;">
{{dataForm.circulatOrder.acceptDate}}
</el-form-item>
</div>
@@ -159,21 +161,21 @@
<zt-dict v-model="dataForm.circulatOrder.cscs" :radio="true" dict="is_or_not"></zt-dict>
</el-form-item>
</div>
- </div>
+ </div>-->
<div class="el-flexCirculationDialog el-border-bottom">
<div style="width: 112px;text-align: center;font-weight: 600">
鏍″噯妫�娴嬩汉
</div>
<div class="el-border-left-right" style="width: 20%;height: 40px;">
- <el-form-item style="width: 100%;padding-left:20px;margin:0;">
- {{dataForm.circulatOrder.calibratDetect}}
+ <el-form-item style="width: 100%;padding-left:20px;margin:0;">
+ {{dataForm.circulatOrder.calibratDetector}}
</el-form-item>
</div>
<div style="width: 52px;text-align: center;font-weight: 600">
鏃堕棿
</div>
<div class="el-border-left-right" style="width: 20%;height: 40px;">
- <el-form-item style="width: 100%;padding-left:20px;margin:0;">
+ <el-form-item style="width: 100%;padding-left:20px;margin:0;">
{{dataForm.circulatOrder.detectDate}}
</el-form-item>
</div>
@@ -186,12 +188,12 @@
</el-form-item>
</div>
</div>
- <div class="el-flexCirculationDialog el-border-bottom">
+ <!-- <div class="el-flexCirculationDialog el-border-bottom">
<div style="width: 112px;text-align: center;font-weight: 600">
鐗╁搧鍏ュ簱浜�
</div>
<div class="el-border-left-right" style="width: 20%;height: 40px;">
- <el-form-item style="width: 100%;padding-left:20px;margin:0;">
+ <el-form-item style="width: 100%;padding-left:20px;margin:0;">
{{dataForm.circulatOrder.warehouse}}
</el-form-item>
</div>
@@ -199,7 +201,7 @@
鏃堕棿
</div>
<div class="el-border-left-right" style="width: 20%;height: 40px;">
- <el-form-item style="width: 100%;padding-left:20px;margin:0;">
+ <el-form-item style="width: 100%;padding-left:20px;margin:0;">
{{dataForm.circulatOrder.warehouseDate}}
</el-form-item>
</div>
@@ -211,21 +213,21 @@
<zt-dict v-model="dataForm.circulatOrder.warehouseSituation" :radio="true" dict="is_or_not"></zt-dict>
</el-form-item>
</div>
- </div>
+ </div>-->
<div class="el-flexCirculationDialog el-border-bottom">
<div style="width: 112px;text-align: center;font-weight: 600">
鐗╁搧鍙戞斁浜�
</div>
<div class="el-border-left-right " style="width: 20%;height: 40px;">
- <el-form-item style="width: 100%;padding-left:20px;margin:0;">
- {{dataForm.circulatOrder.itemIssue}}
+ <el-form-item style="width: 100%;padding-left:20px;margin:0;">
+ {{dataForm.circulatOrder.itemIssuer}}
</el-form-item>
</div>
<div style="width: 52px;text-align: center;font-weight: 600">
鏃堕棿
</div>
<div class="el-border-left-right " style="width: 20%;height: 40px;">
- <el-form-item style="width: 100%;padding-left:20px;margin:0;">
+ <el-form-item style="width: 100%;padding-left:20px;margin:0;">
{{dataForm.circulatOrder.issueDate}}
</el-form-item>
</div>
@@ -243,58 +245,11 @@
澶囨敞
</div>
<div class="el-border-left " style="width: 20%;height: 40px">
- <el-form-item style="width: 100%;padding-left:20px;margin:0;">
- {{dataForm.circulatOrder.itemAccept}}
+ <el-form-item style="width: 100%;padding-left:20px;margin:0;">
+ <el-input v-model="dataForm.circulatOrder.itemAcceptr"></el-input>
</el-form-item>
</div>
</div>
-<!-- <div class="circulationContentWidth">
- <el-form-item class="marginTopAndMarginBottom" label="鐗╁搧鎺ユ敹浜�" style="width: 32%">
- <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.circulatOrder.acceptDate" placeholder="鏃堕棿"></el-input>
- </el-form-item>
- <el-form-item class="marginTopAndMarginBottom" label="鎯呭喌璇存槑" style="width: 32%">
- <span>鏄惁瀹屾垚鐥呮瘨鏌ユ潃锛�
- <zt-dict v-model="dataForm.circulatOrder.acceptSituation" :radio="true" dict="is_or_not"></zt-dict>
- </span>
- <span>鐥呮瘨搴撶増鏈細<el-input v-model="dataForm.circulatOrder.acceptSituation" placeholder="鐥呮瘨搴撶増鏈�"></el-input></span>
- </el-form-item>
- <el-form-item class="marginTopAndMarginBottom3" label="鏍″噯妫�娴嬩汉" style="width: 32%">
- <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.circulatOrder.detectDate" placeholder="鏃堕棿"></el-input>
- </el-form-item>
- <el-form-item class="marginTopAndMarginBottom3" label="鎯呭喌璇存槑" style="width: 32%">
-<!– <el-input v-model="dataForm.circulatOrder.detectSituation" placeholder="鎯呭喌璇存槑"></el-input>–>
- <zt-dict v-model="dataForm.circulatOrder.detectSituation" :radio="true" dict="is_or_not"></zt-dict>
- </el-form-item>
- <el-form-item class="marginTopAndMarginBottom2" label="鐗╁搧鍏ュ簱浜�" style="width: 32%">
- <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.circulatOrder.warehouseDate" placeholder="鏃堕棿"></el-input>
- </el-form-item>
- <el-form-item class="marginTopAndMarginBottom2" label="鎯呭喌璇存槑" style="width: 32%">
-<!– <el-input v-model="dataForm.circulatOrder.warehouseSituation" placeholder="鎯呭喌璇存槑"></el-input>–>
- <zt-dict v-model="dataForm.circulatOrder.warehouseSituation" :radio="true" dict="is_or_not"></zt-dict>
- </el-form-item>
- <el-form-item class="marginTopAndMarginBottom2" label="鐗╁搧鍙戞斁浜�" style="width: 32%">
- <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.circulatOrder.issueDate" placeholder="鏃堕棿"></el-input>
- </el-form-item>
- <el-form-item class="marginTopAndMarginBottom2" label="鎯呭喌璇存槑" style="width: 32%">
-<!– <el-input v-model="dataForm.circulatOrder.issueSituation" placeholder="鎯呭喌璇存槑"></el-input>–>
- <zt-dict v-model="dataForm.circulatOrder.issueSituation" :radio="true" dict="is_or_not"></zt-dict>
- </el-form-item>
- <el-form-item class="marginTopAndMarginBottom2 lastChild" label="澶囨敞" style="width: 100%">
- <el-input v-model="dataForm.circulatOrder.remark" placeholder="澶囨敞"></el-input>
- </el-form-item>
- </div>-->
</div>
</el-form>
</zt-dialog>
@@ -304,52 +259,70 @@
export default {
data() {
return {
+ stepMarker: '',
+ title: '鏌ョ湅',
dataForm: {
id: '',
- circulatOrder:{
+ circulatOrder: {
code: '1',
itemAccept: '',
itemRequire: '',
- itemOther:'',
- acceptSituation:'',
+ itemOther: '',
+ acceptSituation: '',
acceptDate: '',
- calibratDetect: '',
+ calibratDetector: '',
detectDate: '',
detectSituation: '',
warehouse: '',
warehouseDate: '',
warehouseSituation: '',
- itemIssue: '',
+ itemIssuer: '',
issueDate: '',
issueSituation: '',
remark: '',
+ virusLibraryVersion:'',
+ itemAcceptor:''
},
project: {
softwareIdentity: '',
softwareName: '',
},
testAgencyInfo: {
- agencyName:'',
+ agencyName: '',
},
- technicalList:[]
+ technicalList: [],
+ flowInfoDto: {}
}
}
},
methods: {
- indexFormat(index){
+ indexFormat(index) {
return index += 1
},
- init(id,row){
- this.dataForm.id = row.id
+ init(id, row) {
+ if (id) {
+ this.dataForm.id = id
+ } else {
+ 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')
+ if (!this.dataForm.disabled) {
+ if (!row.stepMarker) {
+ this.stepMarker = 'wplz_first'
+ this.title = '鐗╁搧鎺ユ敹'
+ } else {
+ this.title = row.stepName
+ this.stepMarker = row.stepMarker
+ }
+ }
+ console.log(this.dataForm.id, this.dataForm.projectId, this.stepMarker, 'this.dataForm.id, this.dataForm.projectId,this.stepMarker')
},
- addCirculatRow(){
+ addCirculatRow() {
this.dataForm.technicalList.push({})
- this.$nextTick(()=>{
- const tableBody=this.$refs.tableCirculatOrderList.$el.querySelector('.el-table__body-wrapper')
+ this.$nextTick(() => {
+ const tableBody = this.$refs.tableCirculatOrderList.$el.querySelector('.el-table__body-wrapper')
tableBody.scrollTop = tableBody.scrollHeight;
})
},
@@ -359,55 +332,81 @@
circulatOrderid: this.dataForm.id,
projectId: this.dataForm.projectId
}
- let res = await this.$http.get(`/itemCirculatOrder/ItemCirculatOrder/getDto`,{params: params})
+ let res = await this.$http.get(`/itemCirculatOrder/ItemCirculatOrder/getDto`, {params: params})
this.dataForm = {
...this.dataForm,
...res.data
}
- console.log(this.dataForm,"getInfo this.dataForm")
+ console.log(this.dataForm, "getInfo this.dataForm")
},
// 琛ㄥ崟鎻愪氦
- async formSubmit() {
- console.log(this.dataForm,"this.dataForm11111")
+ async formSubmit(submitType) {
+ console.log(this.dataForm, "this.dataForm11111")
+ if (submitType == 'tj' || submitType == 'bl') {
+ let flowInfo = {
+ flowCode: 'wplz',
+ stepIdMark: this.stepMarker,
+ submitType: submitType
+ }
+ this.dataForm.flowInfoDto = flowInfo;
+ }
let res = await this.$http[!this.dataForm.id ? 'post' : 'put']('/itemCirculatOrder/ItemCirculatOrder/', this.dataForm)
if (res.success) {
+ /* if (submitType == 'tj') {
+ console.log(res, 'bbbb')
+ let res2 = await this.$http.get('/wf/startFlow', submitForm)
+ if (res2.success) {
+ let res3 = await this.$http.get('/wf/approvePass', submitForm)
+ if (res3.success) {
+ }
+ }
+ } else if (submitType == 'bl') {
+ let res2 = await this.$http.get('/wf/approvePass', submitForm)
+ if (res2.success) {
+ }
+ }*/
await this.$tip.success()
this.$refs.dialog.close()
this.$emit('refreshDataList')
}
-
}
}
}
</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;
-}
+ .el-flexCirculationDialog {
+ display: flex;
+ align-items: center
+ }
-.circulationFormAuto .marginTopAndMarginBottom2 {
- margin-top: -10px !important;
- margin-bottom: 10px !important;
-}
-.circulationFormAuto .marginTopAndMarginBottom3 {
- margin-top: 0 !important;
- margin-bottom: 10px !important;
-}
-.acceptDate> .el-form-item > .el-form-item__content {
- line-height: 80px;
-}
-.circulationFormAuto .el-radio {
- margin-right: 10px;
-}
+ .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;
+ }
+
+ .acceptDate > .el-form-item > .el-form-item__content {
+ line-height: 80px;
+ }
+
+ .circulationFormAuto .el-radio {
+ margin-right: 10px;
+ }
</style>
--
Gitblit v1.9.1