|
@@ -1534,23 +1534,27 @@
|
|
|
// })
|
|
|
// return
|
|
|
// }
|
|
|
+ console.log(this.outContractNo)
|
|
|
if(this.weighingList.agreementType!='代储合同'&&this.tpyeNo == 1){
|
|
|
- if (!this.weighingList.contractPrice && this.weighingList.inOutType != '移库出库'
|
|
|
- ||this.weighingList.inOutType == '移库出库'&&this.weighingList.priceType=='随行就市'&&this.weighingList.warehouseType==2) {
|
|
|
- this.$message({
|
|
|
- message: '价格不能为空',
|
|
|
- type: 'warning',
|
|
|
- })
|
|
|
- return
|
|
|
- }
|
|
|
- console.log(this.isNumber(this.weighingList.contractPrice))
|
|
|
- if(!this.isNumber(this.weighingList.contractPrice)&&!this.priceedit){
|
|
|
- this.$message({
|
|
|
- message: '价格不能为非数字',
|
|
|
- type: 'warning',
|
|
|
- })
|
|
|
- return
|
|
|
+ if(this.weighingList.agreementType=='销售合同'&&this.outContractNo.settlementWeightMethod==1||this.weighingList.agreementType!='销售合同'){
|
|
|
+ if (!this.weighingList.contractPrice && this.weighingList.inOutType != '移库出库'
|
|
|
+ ||this.weighingList.inOutType == '移库出库'&&this.weighingList.priceType=='随行就市'&&this.weighingList.warehouseType==2) {
|
|
|
+ this.$message({
|
|
|
+ message: '价格不能为空',
|
|
|
+ type: 'warning',
|
|
|
+ })
|
|
|
+ return
|
|
|
+ }
|
|
|
+ console.log(this.isNumber(this.weighingList.contractPrice))
|
|
|
+ if(!this.isNumber(this.weighingList.contractPrice)&&!this.priceedit){
|
|
|
+ this.$message({
|
|
|
+ message: '价格不能为非数字',
|
|
|
+ type: 'warning',
|
|
|
+ })
|
|
|
+ return
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
|
|
|
if (
|