|
|
@@ -525,14 +525,27 @@
|
|
|
that.value = false
|
|
|
}
|
|
|
that.gridList = data
|
|
|
-
|
|
|
- that.gridList.reGrade=that.gridList.grade
|
|
|
- that.gridList.reWaterContent=that.gridList.waterContent
|
|
|
- that.gridList.reBulkDensity=that.gridList.bulkDensity
|
|
|
- that.gridList.reImperfectGrain=that.gridList.imperfectGrain
|
|
|
- that.gridList.reImpurity=that.gridList.impurity
|
|
|
- that.gridList.reMildewGrain=that.gridList.mildewGrain
|
|
|
- that.gridList.reJiaorenli=that.gridList.jiaorenli
|
|
|
+ if(!that.gridList.reGrade){
|
|
|
+ that.gridList.reGrade=that.gridList.grade
|
|
|
+ }
|
|
|
+ if(!that.gridList.reWaterContent){
|
|
|
+ that.gridList.reWaterContent=that.gridList.waterContent
|
|
|
+ }
|
|
|
+ if(!that.gridList.reBulkDensity){
|
|
|
+ that.gridList.reBulkDensity=that.gridList.bulkDensity
|
|
|
+ }
|
|
|
+ if(!that.gridList.reImperfectGrain){
|
|
|
+ that.gridList.reImperfectGrain=that.gridList.imperfectGrain
|
|
|
+ }
|
|
|
+ if(!that.gridList.reImpurity){
|
|
|
+ that.gridList.reImpurity=that.gridList.impurity
|
|
|
+ }
|
|
|
+ if(!that.gridList.reMildewGrain){
|
|
|
+ that.gridList.reMildewGrain=that.gridList.mildewGrain
|
|
|
+ }
|
|
|
+ if(!that.gridList.reJiaorenli){
|
|
|
+ that.gridList.reJiaorenli=that.gridList.jiaorenli
|
|
|
+ }
|
|
|
that.$api.doRequest('get', '/warehouseBaseInfo/getWarehouse', {
|
|
|
id: this.cangid
|
|
|
}).then(res => {
|
|
|
@@ -796,14 +809,14 @@
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if (!this.gridList.storageTagNo) {
|
|
|
- this.$api.msg('囤位号不能为空')
|
|
|
- return
|
|
|
- }
|
|
|
- if (this.gridList.storageTagNo.length > 10) {
|
|
|
- this.$api.msg('囤位号不能为空')
|
|
|
- return
|
|
|
- }
|
|
|
+ // if (!this.gridList.storageTagNo) {
|
|
|
+ // this.$api.msg('囤位号不能为空')
|
|
|
+ // return
|
|
|
+ // }
|
|
|
+ // if (this.gridList.storageTagNo.length > 10) {
|
|
|
+ // this.$api.msg('囤位号不能为空')
|
|
|
+ // return
|
|
|
+ // }
|
|
|
if (!this.gridList.carNumber) {
|
|
|
this.$api.msg('车牌号不能为空')
|
|
|
return
|
