|
|
@@ -586,7 +586,7 @@
|
|
|
type: 'warning'
|
|
|
});
|
|
|
}
|
|
|
- }else if(this.dataList1.taskTypeKey==2&&dataList1.inOutType=="退库"||this.dataList1.taskTypeKey==3){
|
|
|
+ }else if(this.dataList1.taskTypeKey==2&&dataList1.inOutType=='退库'||this.dataList1.taskTypeKey==3){
|
|
|
if(this.dataList1.moveTaskNo||this.dataList1.contractNo){
|
|
|
this.$router.push({name:'outsupplyofgoodslook',query:{list:JSON.stringify(this.dataList.sourceRelationInfoList)}})
|
|
|
}else{
|
|
|
@@ -1020,6 +1020,9 @@
|
|
|
this.dataList = response[1]
|
|
|
this.dataList1 = response[0]
|
|
|
}
|
|
|
+ }else if (response[0].taskTypeKey == 4) {
|
|
|
+ this.dataList = response[0]
|
|
|
+ this.dataList1 = response[1]
|
|
|
}
|
|
|
} else {
|
|
|
if (response[0].taskTypeKey == 3) {
|
|
|
@@ -1038,7 +1041,7 @@
|
|
|
this.goods=''
|
|
|
if(this.dataList.sourceRelationInfoList){
|
|
|
for (let i = 0; i < this.dataList.sourceRelationInfoList.length; i++) {
|
|
|
- if(this.dataList.taskTypeKey==2&&this.dataList.inOutType=="退库"||this.dataList.taskTypeKey==4){
|
|
|
+ if(this.dataList.taskTypeKey==2&&this.dataList.inOutType=='退库'||this.dataList.taskTypeKey==4){
|
|
|
for (let q = 0; q < supplygoods[i].sourceRelationInfoList.length; q++) {
|
|
|
if(this.goods.indexOf(supplygoods[i].sourceRelationInfoList[q].goodsName)==-1){
|
|
|
this.goods=this.goods!=''?this.goods+',':''+supplygoods[i].sourceRelationInfoList[q].goodsName
|
|
|
@@ -1049,12 +1052,12 @@
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- if(localStorage.getItem("supplygoods1")){
|
|
|
+ if(localStorage.getItem('supplygoods1')){
|
|
|
this.goods=''
|
|
|
this.dataList1.weight=0
|
|
|
this.dataList.weight=0
|
|
|
- if(this.dataList1.taskTypeKey==2&&this.dataList1.inOutType=="退库"||this.dataList.taskTypeKey==4){
|
|
|
- var supplygoods=JSON.parse(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 i = 0; i < supplygoods.length; i++) {
|
|
|
for (let q = 0; q < supplygoods[i].sourceRelationInfoList.length; q++) {
|
|
|
@@ -1067,7 +1070,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++) {
|
|
|
console.log(this.goods)
|
|
|
this.goods=this.goods!=''?this.goods+',':''+supplygoods[i].goodsName
|
|
|
@@ -1129,7 +1132,7 @@
|
|
|
this.contractNoList = response
|
|
|
for (let i = 0; i < this.contractNoList.length; i++) {
|
|
|
if (this.contractNoList[i].contractNo == this.dataList.contractNo) {
|
|
|
- if (this.contractNoList[i].priceType == "随行就市") {
|
|
|
+ if (this.contractNoList[i].priceType == '随行就市') {
|
|
|
this.Pricetype = false
|
|
|
} else {
|
|
|
this.Pricetype = true
|
