|
@@ -238,7 +238,7 @@
|
|
<span class="unchangeable">*</span>
|
|
<span class="unchangeable">*</span>
|
|
</ws-form-item>
|
|
</ws-form-item>
|
|
<!-- 最终实际交易量(吨) -->
|
|
<!-- 最终实际交易量(吨) -->
|
|
- <ws-form-item label="最终实际交易量(吨)" span="1" prop="totalContractPrice">
|
|
|
|
|
|
+ <ws-form-item label="最终实际交易量(吨)" span="1" prop="finalTradingVolume">
|
|
<ws-input v-model="deptBudgetList.finalTradingVolume" maxlength="100" placeholder="请输入最终实际交易量"
|
|
<ws-input v-model="deptBudgetList.finalTradingVolume" maxlength="100" placeholder="请输入最终实际交易量"
|
|
size="small" />
|
|
size="small" />
|
|
</ws-form-item>
|
|
</ws-form-item>
|
|
@@ -940,20 +940,22 @@
|
|
})
|
|
})
|
|
return
|
|
return
|
|
}
|
|
}
|
|
- if (!this.deptBudgetList.unitContractPrice) {
|
|
|
|
|
|
+ if(this.deptBudgetList.priceType == "定价销售"){
|
|
|
|
+ if (!this.deptBudgetList.unitContractPrice ) {
|
|
this.$message({
|
|
this.$message({
|
|
message: '请输入合同单价!',
|
|
message: '请输入合同单价!',
|
|
type: 'warning',
|
|
type: 'warning',
|
|
})
|
|
})
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
+ }
|
|
if (
|
|
if (
|
|
isNaN(this.deptBudgetList.unitContractPrice) ||
|
|
isNaN(this.deptBudgetList.unitContractPrice) ||
|
|
(String(this.deptBudgetList.unitContractPrice).indexOf('.') != -1 &&
|
|
(String(this.deptBudgetList.unitContractPrice).indexOf('.') != -1 &&
|
|
String(this.deptBudgetList.unitContractPrice).length -
|
|
String(this.deptBudgetList.unitContractPrice).length -
|
|
(String(this.deptBudgetList.unitContractPrice).indexOf('.') + 1) >
|
|
(String(this.deptBudgetList.unitContractPrice).indexOf('.') + 1) >
|
|
2) ||
|
|
2) ||
|
|
- this.deptBudgetList.unitContractPrice <= 0 ||
|
|
|
|
|
|
+ this.deptBudgetList.unitContractPrice < 0 ||
|
|
this.deptBudgetList.unitContractPrice > 10000
|
|
this.deptBudgetList.unitContractPrice > 10000
|
|
) {
|
|
) {
|
|
this.$message({
|
|
this.$message({
|
|
@@ -962,20 +964,23 @@
|
|
})
|
|
})
|
|
return
|
|
return
|
|
}
|
|
}
|
|
- if (!this.deptBudgetList.totalContractPrice) {
|
|
|
|
|
|
+ if(this.deptBudgetList.priceType == "定价销售"){
|
|
|
|
+ if (!this.deptBudgetList.totalContractPrice) {
|
|
this.$message({
|
|
this.$message({
|
|
message: '请输入合同总价!',
|
|
message: '请输入合同总价!',
|
|
type: 'warning',
|
|
type: 'warning',
|
|
})
|
|
})
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
+ }
|
|
|
|
+
|
|
if (
|
|
if (
|
|
isNaN(this.deptBudgetList.totalContractPrice) ||
|
|
isNaN(this.deptBudgetList.totalContractPrice) ||
|
|
(String(this.deptBudgetList.totalContractPrice).indexOf('.') != -1 &&
|
|
(String(this.deptBudgetList.totalContractPrice).indexOf('.') != -1 &&
|
|
String(this.deptBudgetList.totalContractPrice).length -
|
|
String(this.deptBudgetList.totalContractPrice).length -
|
|
(String(this.deptBudgetList.totalContractPrice).indexOf('.') + 1) >
|
|
(String(this.deptBudgetList.totalContractPrice).indexOf('.') + 1) >
|
|
2) ||
|
|
2) ||
|
|
- this.deptBudgetList.totalContractPrice <= 0 ||
|
|
|
|
|
|
+ this.deptBudgetList.totalContractPrice < 0 ||
|
|
this.deptBudgetList.totalContractPrice > 1000000000
|
|
this.deptBudgetList.totalContractPrice > 1000000000
|
|
) {
|
|
) {
|
|
this.$message({
|
|
this.$message({
|