|
@@ -200,7 +200,6 @@
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="租金评估(万元)" prop="rentEvaluation"
|
|
|
:rules="[
|
|
|
- {required: true, message:'租金评估不能为空', trigger:'blur'}
|
|
|
]">
|
|
|
<el-input-number
|
|
|
v-model="inputForm.rentEvaluation"
|
|
@@ -257,7 +256,7 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
|
|
|
- <el-col :span="12">
|
|
|
+ <el-col :span="12" v-if="inputForm.programProjectListInfo.projectMould === '1'">
|
|
|
<el-form-item label="租金类型" prop="rentType"
|
|
|
:rules=" [
|
|
|
{required: true, message:'租金类型不能为空', trigger:'blur'}
|
|
@@ -266,6 +265,14 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
|
|
|
+ <el-col :span="12" v-else>
|
|
|
+ <el-form-item label="租金类型" prop="rentType"
|
|
|
+ :rules=" [
|
|
|
+ ]" >
|
|
|
+ <el-input v-model="inputForm.rentType" maxlength="64" placeholder="请填写租金类型" clearable ></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="是否开票" prop="isInvoice"
|
|
|
:rules="[
|
|
@@ -855,9 +862,10 @@
|
|
|
if (valid) {
|
|
|
if (this.commonJS.isEmpty(this.inputForm.waystEvaluation) &&
|
|
|
this.commonJS.isEmpty(this.inputForm.fixedAssetsEvaluation) &&
|
|
|
+ this.commonJS.isEmpty(this.inputForm.rentEvaluation) &&
|
|
|
this.commonJS.isEmpty(this.inputForm.netAssetsEvaluation)) {
|
|
|
this.loading = false
|
|
|
- this.$message.error('废旧物资评估值(万元)、固定资产评估值(万元)、净资产评估值,至少要填写一个!')
|
|
|
+ this.$message.error('废旧物资评估值(万元)、固定资产评估值(万元)、净资产评估值、租金评估,至少要填写一个!')
|
|
|
throw new Error()
|
|
|
}
|
|
|
this.loading = true
|