|
|
@@ -504,9 +504,9 @@
|
|
|
this.sourceId=''
|
|
|
this.dataList.weight=0
|
|
|
this.dataList1.weight=0
|
|
|
- if(localStorage.getItem("supplygoods1")){
|
|
|
- if(this.dataList1.taskTypeKey==2&&this.dataList1.inOutType=="退库"||this.dataList.taskTypeKey==4){
|
|
|
- var supplygoods=JSON.parse(localStorage.getItem("supplygoods1"))
|
|
|
+ if(localStorage.getItem('supplygoods1')){
|
|
|
+ if(this.dataList1.taskTypeKey==2&&this.dataList1.inOutType=='退库'||this.dataList.taskTypeKey==4){
|
|
|
+ var supplygoods=JSON.parse(localStorage.getItem('supplygoods1'))
|
|
|
for (let i = 0; i < supplygoods.length; i++) {
|
|
|
for (let q = 0; q < supplygoods[i].sourceRelationInfoList.length; q++) {
|
|
|
if(this.goods.indexOf(supplygoods[i].sourceRelationInfoList[q].goodsName)==-1){
|
|
|
@@ -517,7 +517,7 @@
|
|
|
}
|
|
|
}
|
|
|
}else if(this.dataList.taskTypeKey==1||this.dataList.taskTypeKey==3){
|
|
|
- var supplygoods=JSON.parse(localStorage.getItem("supplygoods1"))
|
|
|
+ var supplygoods=JSON.parse(localStorage.getItem('supplygoods1'))
|
|
|
for (let i = 0; i < supplygoods.length; i++) {
|
|
|
this.goods=this.goods!=''?this.goods+',':''+supplygoods[i].goodsName
|
|
|
this.dataList1.weight=Number(this.dataList1.weight)+Number(supplygoods[i].estimateOutWarehouseWeight)
|
|
|
@@ -543,7 +543,7 @@
|
|
|
type: 'warning'
|
|
|
});
|
|
|
}
|
|
|
- }else if(this.dataList1.taskTypeKey==2&&this.dataList1.inOutType=="退库"||this.dataList1.taskTypeKey==3){
|
|
|
+ }else if(this.dataList1.taskTypeKey==2&&this.dataList1.inOutType=='退库'||this.dataList1.taskTypeKey==3){
|
|
|
if(this.dataList1.moveTaskNo||this.dataList1.contractNo){
|
|
|
this.$router.push({name:'outsupplyofgoods',query:{contractNo:this.dataList1.contractNo}})
|
|
|
}else{
|
|
|
@@ -783,7 +783,7 @@
|
|
|
this.$set(this.dataList1, 'gradeKey', response.gradeKey)
|
|
|
this.$set(this.dataList1, 'waterContent', response.waterContent)
|
|
|
this.$set(this.dataList1, 'bulkDensity', response.bulkDensity)
|
|
|
- if(this.dataList1.taskTypeKey==2&&this.dataList1.inOutType=="退库"){
|
|
|
+ if(this.dataList1.taskTypeKey==2&&this.dataList1.inOutType=='退库'){
|
|
|
this.goods=''
|
|
|
this.dataList1.weight=0
|
|
|
}else{
|
|
|
@@ -1405,11 +1405,13 @@
|
|
|
// this.dataList.baseId =
|
|
|
this.dataList.inOutFlag = 1
|
|
|
this.dataList1.inOutFlag = 2
|
|
|
- var data=JSON.parse(localStorage.getItem("supplygoods"))
|
|
|
- for (let i = 0; i < data.length; i++) {
|
|
|
- data[i].sourceId=data[i].id
|
|
|
-
|
|
|
+ var data=JSON.parse(localStorage.getItem('supplygoods'))
|
|
|
+ if(data){
|
|
|
+ for (let i = 0; i < data.length; i++) {
|
|
|
+ data[i].sourceId=data[i].id
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
var supplygoods=data
|
|
|
if (this.dataList.taskTypeKey == 1) {
|
|
|
this.dataList.inOutTaskNo = this.inOutTaskNo
|
