|
|
@ -59,8 +59,12 @@ |
|
|
|
|
|
|
|
</view> |
|
|
|
<view class="" style="position: fixed;width: 100%;bottom: 0rpx;left: 0px;"> |
|
|
|
<button @click="printImage" |
|
|
|
style='background:rgb(60, 156, 255) !important ;color: white;margin-top: 80rpx;'> 打印<text v-if="tabIndex == 1">检验指引单</text><text v-if="tabIndex == 2&&isHave">上架指引单</text></button> |
|
|
|
<button @click="printImage" v-if="tabIndex == 1 && data1.inspectDTOList && data1.inspectDTOList.length>0" |
|
|
|
style='background:rgb(60, 156, 255) !important ;color: white;margin-top: 80rpx;'> 打印检验指引单 |
|
|
|
</button> |
|
|
|
<button @click="printImage" v-if="tabIndex == 2&&isHave && data.sublist && data.sublist.length>0" |
|
|
|
style='background:rgb(60, 156, 255) !important ;color: white;margin-top: 80rpx;'> 打印上架指引单 |
|
|
|
</button> |
|
|
|
</view> |
|
|
|
|
|
|
|
</view> |
|
|
@ -101,12 +105,12 @@ |
|
|
|
currentPage: 1, |
|
|
|
pageSize: 3, |
|
|
|
showTableSubList: [], |
|
|
|
showTableInspectDTOList:[], |
|
|
|
showTableInspectDTOList: [], |
|
|
|
|
|
|
|
currentPage1: 1, |
|
|
|
pageSize1: 20, |
|
|
|
number:'', |
|
|
|
isHave:false |
|
|
|
number: '', |
|
|
|
isHave: false |
|
|
|
} |
|
|
|
}, |
|
|
|
|
|
|
@ -227,7 +231,7 @@ |
|
|
|
(this.currentPage - 1) * this.pageSize, |
|
|
|
this.currentPage * this.pageSize |
|
|
|
) |
|
|
|
if(array.length>0){ |
|
|
|
if (array.length > 0) { |
|
|
|
this.showTableSubList = [...this.showTableSubList, ...array] |
|
|
|
this.currentPage += 1 |
|
|
|
} |
|
|
@ -242,14 +246,14 @@ |
|
|
|
(this.currentPage1 - 1) * this.pageSize1, |
|
|
|
this.currentPage1 * this.pageSize1 |
|
|
|
) |
|
|
|
if(array.length>0){ |
|
|
|
if (array.length > 0) { |
|
|
|
this.showTableInspectDTOList = [...this.showTableInspectDTOList, ...array] |
|
|
|
this.currentPage1 += 1 |
|
|
|
} |
|
|
|
} else { |
|
|
|
this.showTableInspectDTOList = this.data1.inspectDTOList |
|
|
|
} |
|
|
|
console.log(233,this.showTableInspectDTOList) |
|
|
|
console.log(233, this.showTableInspectDTOList) |
|
|
|
} |
|
|
|
}, |
|
|
|
watch: { |
|
|
@ -291,12 +295,12 @@ |
|
|
|
this.getPurchaseReceiptJobHtml() |
|
|
|
}, |
|
|
|
onReachBottom() { |
|
|
|
if(this.tabIndex == 1){ |
|
|
|
if(this.showTableInspectDTOList.length!=this.data1.inspectDTOList.length){ |
|
|
|
if (this.tabIndex == 1) { |
|
|
|
if (this.showTableInspectDTOList.length != this.data1.inspectDTOList.length) { |
|
|
|
this.getTableInspectDTOList() |
|
|
|
} |
|
|
|
}else{ |
|
|
|
if(this.showTableSubList.length!=this.data.sublist.length){ |
|
|
|
} else { |
|
|
|
if (this.showTableSubList.length != this.data.sublist.length) { |
|
|
|
this.getTableSubList() |
|
|
|
} |
|
|
|
} |
|
|
|