Merge remote-tracking branch 'origin/dev-cq' into dev-cq
This commit is contained in:
commit
6b8ba4129b
|
|
@ -9,12 +9,12 @@
|
||||||
width="600px"
|
width="600px"
|
||||||
>
|
>
|
||||||
<div class="form_box_one" v-if="!isShow">
|
<div class="form_box_one" v-if="!isShow">
|
||||||
<el-form ref="dynamicValidateForm" :model="dynamicValidateForm" class="demo-dynamic" label-width="90px">
|
<el-form ref="dynamicValidateForm" :model="dynamicValidateForm" class="demo-dynamic" label-width="100px">
|
||||||
<div class="bor_box">
|
<div class="bor_box">
|
||||||
<p class="form_box_title">编码管理设备</p>
|
<p class="form_box_title">编码管理设备</p>
|
||||||
<div class="form_box_line"></div>
|
<div class="form_box_line"></div>
|
||||||
<div class="form_box_item">
|
<div class="form_box_item">
|
||||||
<el-form-item label="报废原因:">
|
<el-form-item label="报废原因:" prop="scrapReason" :rules="{ required: true, message: '请输入报废原因', trigger: 'blur'}">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="dynamicValidateForm.scrapReason"
|
v-model="dynamicValidateForm.scrapReason"
|
||||||
placeholder="请输入"
|
placeholder="请输入"
|
||||||
|
|
@ -90,7 +90,7 @@
|
||||||
style="width: 350px"
|
style="width: 350px"
|
||||||
></el-input>
|
></el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="报废原因:">
|
<el-form-item label="报废原因:" prop="scrapReason" :rules="{ required: true, message: '请输入报废原因', trigger: 'blur'}">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="dynamicValidateFormTwo.scrapReason"
|
v-model="dynamicValidateFormTwo.scrapReason"
|
||||||
placeholder="请输入"
|
placeholder="请输入"
|
||||||
|
|
@ -346,13 +346,30 @@ export default {
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
init() {
|
init() {
|
||||||
|
// 清除验证
|
||||||
|
if (this.$refs.dynamicValidateForm) this.$refs.dynamicValidateForm.clearValidate()
|
||||||
|
if (this.$refs.dynamicValidateFormTwo) this.$refs.dynamicValidateFormTwo.clearValidate()
|
||||||
if (this.rowObj.code !== null && this.rowObj.code !== '') {
|
if (this.rowObj.code !== null && this.rowObj.code !== '') {
|
||||||
this.dynamicValidateForm = {}
|
this.dynamicValidateForm = {
|
||||||
this.dynamicValidateFormTwo = {}
|
scrapReason: '',
|
||||||
|
scrapType: 1,
|
||||||
|
}
|
||||||
|
this.dynamicValidateFormTwo = {
|
||||||
|
scrapNum: '',
|
||||||
|
scrapReason: '',
|
||||||
|
scrapType: 1,
|
||||||
|
}
|
||||||
this.isShow = false
|
this.isShow = false
|
||||||
} else {
|
} else {
|
||||||
this.dynamicValidateForm = {}
|
this.dynamicValidateForm = {
|
||||||
this.dynamicValidateFormTwo = {}
|
scrapReason: '',
|
||||||
|
scrapType: 1,
|
||||||
|
}
|
||||||
|
this.dynamicValidateFormTwo = {
|
||||||
|
scrapNum: '',
|
||||||
|
scrapReason: '',
|
||||||
|
scrapType: 1,
|
||||||
|
}
|
||||||
this.isShow = true
|
this.isShow = true
|
||||||
}
|
}
|
||||||
getInfo().then(res => {
|
getInfo().then(res => {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue