|
@@ -336,6 +336,7 @@
|
|
size: 'mini',
|
|
size: 'mini',
|
|
placeholder: ' ',
|
|
placeholder: ' ',
|
|
type: "number",
|
|
type: "number",
|
|
|
|
+ min: 0,
|
|
defaultValue: 0
|
|
defaultValue: 0
|
|
},
|
|
},
|
|
}
|
|
}
|
|
@@ -380,6 +381,7 @@
|
|
size: 'mini',
|
|
size: 'mini',
|
|
placeholder: ' ',
|
|
placeholder: ' ',
|
|
type: "integer",
|
|
type: "integer",
|
|
|
|
+ min: 0,
|
|
},
|
|
},
|
|
}
|
|
}
|
|
},
|
|
},
|
|
@@ -393,6 +395,7 @@
|
|
size: 'mini',
|
|
size: 'mini',
|
|
placeholder: ' ',
|
|
placeholder: ' ',
|
|
type: "number",
|
|
type: "number",
|
|
|
|
+ min: 0,
|
|
},
|
|
},
|
|
}
|
|
}
|
|
},
|
|
},
|
|
@@ -406,6 +409,7 @@
|
|
size: 'mini',
|
|
size: 'mini',
|
|
placeholder: ' ',
|
|
placeholder: ' ',
|
|
type: "number",
|
|
type: "number",
|
|
|
|
+ min: 0,
|
|
},
|
|
},
|
|
}
|
|
}
|
|
},
|
|
},
|
|
@@ -419,6 +423,7 @@
|
|
size: 'mini',
|
|
size: 'mini',
|
|
placeholder: ' ',
|
|
placeholder: ' ',
|
|
type: "number",
|
|
type: "number",
|
|
|
|
+ min: 0,
|
|
},
|
|
},
|
|
}
|
|
}
|
|
},
|
|
},
|
|
@@ -432,6 +437,7 @@
|
|
size: 'mini',
|
|
size: 'mini',
|
|
placeholder: ' ',
|
|
placeholder: ' ',
|
|
type: "number",
|
|
type: "number",
|
|
|
|
+ min: 0,
|
|
},
|
|
},
|
|
}
|
|
}
|
|
},
|
|
},
|
|
@@ -525,6 +531,7 @@
|
|
size: 'mini',
|
|
size: 'mini',
|
|
placeholder: ' ',
|
|
placeholder: ' ',
|
|
type: "number",
|
|
type: "number",
|
|
|
|
+ min: 0,
|
|
},
|
|
},
|
|
}
|
|
}
|
|
},
|
|
},
|
|
@@ -567,7 +574,8 @@
|
|
attr: {
|
|
attr: {
|
|
size: 'mini',
|
|
size: 'mini',
|
|
placeholder: ' ',
|
|
placeholder: ' ',
|
|
- type: "number",
|
|
|
|
|
|
+ type: "integer",
|
|
|
|
+ min: 0,
|
|
},
|
|
},
|
|
}
|
|
}
|
|
},
|
|
},
|
|
@@ -581,6 +589,7 @@
|
|
size: 'mini',
|
|
size: 'mini',
|
|
placeholder: ' ',
|
|
placeholder: ' ',
|
|
type: "number",
|
|
type: "number",
|
|
|
|
+ min: 0,
|
|
},
|
|
},
|
|
}
|
|
}
|
|
},
|
|
},
|
|
@@ -594,6 +603,7 @@
|
|
size: 'mini',
|
|
size: 'mini',
|
|
placeholder: ' ',
|
|
placeholder: ' ',
|
|
type: "number",
|
|
type: "number",
|
|
|
|
+ min: 0,
|
|
},
|
|
},
|
|
}
|
|
}
|
|
},
|
|
},
|
|
@@ -607,6 +617,7 @@
|
|
size: 'mini',
|
|
size: 'mini',
|
|
placeholder: ' ',
|
|
placeholder: ' ',
|
|
type: "number",
|
|
type: "number",
|
|
|
|
+ min: 0,
|
|
},
|
|
},
|
|
}
|
|
}
|
|
},
|
|
},
|
|
@@ -620,6 +631,7 @@
|
|
size: 'mini',
|
|
size: 'mini',
|
|
placeholder: ' ',
|
|
placeholder: ' ',
|
|
type: "number",
|
|
type: "number",
|
|
|
|
+ min: 0,
|
|
},
|
|
},
|
|
}
|
|
}
|
|
},
|
|
},
|
|
@@ -682,7 +694,8 @@
|
|
attr: {
|
|
attr: {
|
|
size: 'mini',
|
|
size: 'mini',
|
|
defaultValue: '1',
|
|
defaultValue: '1',
|
|
- type: 'number'
|
|
|
|
|
|
+ type: 'number',
|
|
|
|
+ min: '0'
|
|
},
|
|
},
|
|
}
|
|
}
|
|
},
|
|
},
|
|
@@ -776,7 +789,8 @@
|
|
compConfig: {
|
|
compConfig: {
|
|
attr: {
|
|
attr: {
|
|
placeholder: '请输入基本售价',
|
|
placeholder: '请输入基本售价',
|
|
- type: 'number'
|
|
|
|
|
|
+ type: 'number',
|
|
|
|
+ min: '0'
|
|
}
|
|
}
|
|
}
|
|
}
|
|
},
|
|
},
|
|
@@ -788,7 +802,8 @@
|
|
compConfig: {
|
|
compConfig: {
|
|
attr: {
|
|
attr: {
|
|
placeholder: '请输入市场价格',
|
|
placeholder: '请输入市场价格',
|
|
- type: 'number'
|
|
|
|
|
|
+ type: 'number',
|
|
|
|
+ min: '0'
|
|
}
|
|
}
|
|
}
|
|
}
|
|
},
|
|
},
|
|
@@ -1187,22 +1202,23 @@
|
|
console.log('多规格表格数据 ==> ', this.tableList);
|
|
console.log('多规格表格数据 ==> ', this.tableList);
|
|
for (let v of this.tableList) {
|
|
for (let v of this.tableList) {
|
|
// if (!v.price) return this.$message.warning('物料属性价格必填');
|
|
// if (!v.price) return this.$message.warning('物料属性价格必填');
|
|
- if (parseInt(v.price) <= 0) return this.$message.warning('物料属性价格不能小于1');
|
|
|
|
|
|
+ // if (parseInt(v.price) <= 0) return this.$message.warning('物料属性价格不能小于1');
|
|
// if (!v.unit) return this.$message.warning('物料属性单位必填');
|
|
// if (!v.unit) return this.$message.warning('物料属性单位必填');
|
|
// if (!v.stock) return this.$message.warning('物料属性库存必填');
|
|
// if (!v.stock) return this.$message.warning('物料属性库存必填');
|
|
// if (parseInt(v.stock) <= 0) return this.$message.warning('物料属性库存必须为自然数');
|
|
// if (parseInt(v.stock) <= 0) return this.$message.warning('物料属性库存必须为自然数');
|
|
// if (!v.shelfLife) return this.$message.warning('物料属性保质期必填');
|
|
// if (!v.shelfLife) return this.$message.warning('物料属性保质期必填');
|
|
- if (parseInt(v.shelfLife) <= 0) return this.$message.warning('物料属性保质期必须为自然数');
|
|
|
|
|
|
+ // if (parseInt(v.shelfLife) <= 0) return this.$message.warning('物料属性保质期必须为自然数');
|
|
// if (!v.weight) return this.$message.warning('物料属性重量必填');
|
|
// if (!v.weight) return this.$message.warning('物料属性重量必填');
|
|
- if (parseInt(v.weight) <= 0) return this.$message.warning('物料属性重量不能小于1');
|
|
|
|
|
|
+ // if (parseInt(v.weight) <= 0) return this.$message.warning('物料属性重量不能小于1');
|
|
// if (!v.length) return this.$message.warning('物料属性长度必填');
|
|
// if (!v.length) return this.$message.warning('物料属性长度必填');
|
|
- if (parseInt(v.length) <= 0) return this.$message.warning('物料属性长度不能小于1');
|
|
|
|
|
|
+ // if (parseInt(v.length) <= 0) return this.$message.warning('物料属性长度不能小于1');
|
|
// if (!v.width) return this.$message.warning('物料属性宽度必填');
|
|
// if (!v.width) return this.$message.warning('物料属性宽度必填');
|
|
- if (parseInt(v.width) <= 0) return this.$message.warning('物料属性宽度不能小于1');
|
|
|
|
|
|
+ // if (parseInt(v.width) <= 0) return this.$message.warning('物料属性宽度不能小于1');
|
|
// if (!v.height) return this.$message.warning('物料属性高度必填');
|
|
// if (!v.height) return this.$message.warning('物料属性高度必填');
|
|
- if (parseInt(v.height) <= 0) return this.$message.warning('物料属性高度不能小于1');
|
|
|
|
-
|
|
|
|
- v.weight = v.weight/1000
|
|
|
|
|
|
+ // if (parseInt(v.height) <= 0) return this.$message.warning('物料属性高度不能小于1');
|
|
|
|
+ if(v.weight&&v.weight!=0){
|
|
|
|
+ v.weight = v.weight/1000
|
|
|
|
+ }
|
|
};
|
|
};
|
|
data = { maindataMaterialReceiveParam: query, maindataMaterialSkus: this.tableList }
|
|
data = { maindataMaterialReceiveParam: query, maindataMaterialSkus: this.tableList }
|
|
let newArray : any = []
|
|
let newArray : any = []
|
|
@@ -1229,23 +1245,25 @@
|
|
// console.log('单规格表格数据 ==> ', data.maindataMaterialSkus);
|
|
// console.log('单规格表格数据 ==> ', data.maindataMaterialSkus);
|
|
for (let v of data.maindataMaterialSkus) {
|
|
for (let v of data.maindataMaterialSkus) {
|
|
// if (!v.price) return this.$message.warning('物料价格必填');
|
|
// if (!v.price) return this.$message.warning('物料价格必填');
|
|
- if (parseInt(v.price) <= 0) return this.$message.warning('物料价格不能小于1');
|
|
|
|
- if (parseInt(v.price) < 0) return this.$message.warning('物料价格不能为负数');
|
|
|
|
|
|
+ // if (parseInt(v.price) <= 0) return this.$message.warning('物料价格不能小于1');
|
|
|
|
+ // if (parseInt(v.price) < 0) return this.$message.warning('物料价格不能为负数');
|
|
// if (!v.unit) return this.$message.warning('物料单位必填');
|
|
// if (!v.unit) return this.$message.warning('物料单位必填');
|
|
// if (!v.stock) return this.$message.warning('物料库存必填');
|
|
// if (!v.stock) return this.$message.warning('物料库存必填');
|
|
// if (parseInt(v.stock) <= 0) return this.$message.warning('物料库存必须为自然数');
|
|
// if (parseInt(v.stock) <= 0) return this.$message.warning('物料库存必须为自然数');
|
|
// if (!v.shelfLife) return this.$message.warning('物料保质期必填');
|
|
// if (!v.shelfLife) return this.$message.warning('物料保质期必填');
|
|
- if (parseInt(v.shelfLife) <= 0) return this.$message.warning('物料保质期必须为自然数');
|
|
|
|
|
|
+ // if (parseInt(v.shelfLife) <= 0) return this.$message.warning('物料保质期必须为自然数');
|
|
// if (!v.weight) return this.$message.warning('物料重量必填');
|
|
// if (!v.weight) return this.$message.warning('物料重量必填');
|
|
- if (parseInt(v.weight) <= 0) return this.$message.warning('物料重量不能小于1');
|
|
|
|
|
|
+ // if (parseInt(v.weight) <= 0) return this.$message.warning('物料重量不能小于1');
|
|
// if (!v.length) return this.$message.warning('物料长必填');
|
|
// if (!v.length) return this.$message.warning('物料长必填');
|
|
- if (parseInt(v.length) <= 0) return this.$message.warning('物料长不能小于1');
|
|
|
|
|
|
+ // if (parseInt(v.length) <= 0) return this.$message.warning('物料长不能小于1');
|
|
// if (!v.width) return this.$message.warning('物料宽必填');
|
|
// if (!v.width) return this.$message.warning('物料宽必填');
|
|
- if (parseInt(v.width) <= 0) return this.$message.warning('物料宽不能小于1');
|
|
|
|
|
|
+ // if (parseInt(v.width) <= 0) return this.$message.warning('物料宽不能小于1');
|
|
// if (!v.height) return this.$message.warning('物料高必填');
|
|
// if (!v.height) return this.$message.warning('物料高必填');
|
|
- if (parseInt(v.height) <= 0) return this.$message.warning('物料高不能小于1');
|
|
|
|
|
|
+ // if (parseInt(v.height) <= 0) return this.$message.warning('物料高不能小于1');
|
|
|
|
|
|
- v.weight = v.weight/1000
|
|
|
|
|
|
+ if(v.weight&&v.weight!=0){
|
|
|
|
+ v.weight = v.weight/1000
|
|
|
|
+ }
|
|
};
|
|
};
|
|
data.maindataMaterialSkus[0].isDeleted = 0;
|
|
data.maindataMaterialSkus[0].isDeleted = 0;
|
|
data.maindataMaterialReceiveParam.attributeList = ""
|
|
data.maindataMaterialReceiveParam.attributeList = ""
|