|
|
@@ -188,7 +188,7 @@
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="存放地点(区位码)" prop="storagePlaces"
|
|
|
- :rules="[{required: true, message:'存放地点不能为空', trigger:'blur'}]">
|
|
|
+ :rules="[]">
|
|
|
<el-select multiple style="width:100%;" v-model="inputForm.storagePlaces" class="m-2" placeholder="请选择" clearable>
|
|
|
<el-option
|
|
|
v-for="item in $dictUtils.getDictList('storage_place')"
|
|
|
@@ -200,6 +200,12 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
+ <el-col :span="12">
|
|
|
+ <el-form-item label="存放地点(特殊)" prop="specialPlace"
|
|
|
+ :rules="[]">
|
|
|
+ <el-input v-model="inputForm.specialPlace" class="m-2" placeholder="请输入存放地点(特殊)" clearable></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
<el-col :span="24">
|
|
|
<el-form-item label="备注" prop="remarks"
|
|
|
:rules="[ ]">
|
|
|
@@ -269,6 +275,7 @@
|
|
|
totalAssets:'',
|
|
|
storagePlaces:'',
|
|
|
remarks:'',
|
|
|
+ specialPlace:''
|
|
|
},
|
|
|
baseKey: '',
|
|
|
keyWatch: '',
|
|
|
@@ -349,6 +356,7 @@
|
|
|
totalAssets:'',
|
|
|
storagePlaces:'',
|
|
|
remarks:'',
|
|
|
+ specialPlace:''
|
|
|
}
|
|
|
if (method === 'add') {
|
|
|
this.title = `新建报告归档信息`
|
|
|
@@ -409,10 +417,10 @@
|
|
|
this.$message.error('报告文号不能为空')
|
|
|
throw new Error('报告文号不能为空')
|
|
|
}
|
|
|
- if (this.commonJS.isEmpty(this.inputForm.storagePlaces)){
|
|
|
+ if (this.commonJS.isEmpty(this.inputForm.storagePlaces) && this.commonJS.isEmpty(this.inputForm.specialPlace)){
|
|
|
this.loading = false
|
|
|
- this.$message.error('存放地区不能为空')
|
|
|
- throw new Error('存放地区不能为空')
|
|
|
+ this.$message.error('存放地区区位码和特殊最少填一个')
|
|
|
+ throw new Error('存放地区区位码和特殊最少填一个')
|
|
|
}
|
|
|
if (this.commonJS.isNotEmpty(this.inputForm.fileBoxNumber) && this.commonJS.isNotEmpty(this.inputForm.reportNoType)){
|
|
|
this.reportArchieveService.checkFileBoxNumber(this.inputForm.fileBoxNumber,this.inputForm.reportNoType).then((data)=>{
|
sangwenwei