|
|
@@ -607,7 +607,7 @@
|
|
|
that.goodsList = res.data.data
|
|
|
if (that.goodsList.length > 0) {
|
|
|
that.gridList.goodsName = that.goodsList[0].goodsName
|
|
|
- this.setGoodName([0])
|
|
|
+ this.setGoodName([0],1)
|
|
|
uni.setStorageSync('purchasePriceList', that.goodsList)
|
|
|
that.purchasePriceList = uni.getStorageSync('purchasePriceList')
|
|
|
}
|
|
|
@@ -652,8 +652,6 @@
|
|
|
flag: 7,
|
|
|
|
|
|
}).then(res => {
|
|
|
- console.log(res)
|
|
|
-
|
|
|
if(res.data.data){
|
|
|
console.log(res.data.data)
|
|
|
uni.hideLoading();
|
|
|
@@ -772,8 +770,9 @@
|
|
|
this.gridList.contractNo = this.taskNolist[e[0]].moveTaskNo
|
|
|
}
|
|
|
for (let i = 0; i < this.contractNolist.length; i++) {
|
|
|
- console.log(this.gridList.contractNo,this.contractNolist[i].contractNo,this.gridList.contractNo==this.contractNolist[i].contractNo)
|
|
|
+
|
|
|
if(this.gridList.contractNo==this.contractNolist[i].contractNo){
|
|
|
+ console.log(this.contractNolist[i])
|
|
|
this.gridList.goodsName = this.contractNolist[i].goodsName
|
|
|
this.gridList.goodsNameKey = this.contractNolist[i].goodsNameKey
|
|
|
this.gridList.grade = this.contractNolist[i].grade
|
|
|
@@ -786,6 +785,7 @@
|
|
|
} else {
|
|
|
this.gridList.tips ='卖方' +this.contractNolist[i].seller +'（ ' + this.contractNolist[i].unitContractPrice +'元/吨）'
|
|
|
}
|
|
|
+
|
|
|
this.gridList.inOutTypeKey = 1
|
|
|
}else if(this.gridList.inOutType=='移库入库'){
|
|
|
this.warehouseTradeCount = '000' + this.warehouseTradeCount
|
|
|
@@ -990,10 +990,10 @@
|
|
|
// this.$api.msg('囤位号不能为空')
|
|
|
// return
|
|
|
// }
|
|
|
- if (this.gridList.storageTagNo&&this.gridList.storageTagNo.length > 10) {
|
|
|
- this.$api.msg('囤位号不能为空')
|
|
|
- return
|
|
|
- }
|
|
|
+ // if (this.gridList.storageTagNo&&this.gridList.storageTagNo.length > 10) {
|
|
|
+ // this.$api.msg('囤位号不能为空')
|
|
|
+ // return
|
|
|
+ // }
|
|
|
if (!this.gridList.carNumber) {
|
|
|
this.$api.msg('车牌号不能为空')
|
|
|
return
|
|
|
@@ -1152,7 +1152,7 @@
|
|
|
this.gridList.gradeKey = this.gradeList[e[0]].key
|
|
|
this.waterContentChange()
|
|
|
},
|
|
|
- setGoodName(e) {
|
|
|
+ setGoodName(e,status) {
|
|
|
//
|
|
|
// [e[0]] = 0
|
|
|
// this.$set(this.gradeList,'grade',this.gradeList[e[0]].value)
|
|
|
@@ -1180,13 +1180,18 @@
|
|
|
// })
|
|
|
uni.setStorageSync('goodsName', this.gridList.goodsName)
|
|
|
if (this.gridList.type == "干粮" && this.gridList.goodsName) {
|
|
|
- uni.showLoading({title: '加载中',mask:true})
|
|
|
+ if(!status){
|
|
|
+ uni.showLoading({title: '加载中',mask:true})
|
|
|
+ }
|
|
|
+
|
|
|
this.$api.doRequest('get', '/purchasePrice/dryGrainPrice', {
|
|
|
warehouseId: this.cangid,
|
|
|
goodsName: this.gridList.goodsName
|
|
|
}).then(res => {
|
|
|
this.gridList.dryGrainPrice = res.data.data
|
|
|
- uni.hideLoading()
|
|
|
+ if(!status){
|
|
|
+ uni.hideLoading()
|
|
|
+ }
|
|
|
})
|
|
|
}
|
|
|
this.waterContentChange()
|
