|
@@ -27,7 +27,7 @@
|
|
<view class="bot u-flex u-row-between">
|
|
<view class="bot u-flex u-row-between">
|
|
<view>
|
|
<view>
|
|
适配有货
|
|
适配有货
|
|
- <text>{{ item.isStockCount || 0 }}</text>
|
|
|
|
|
|
+ <text>{{ item.inStockCount || 0 }}</text>
|
|
次
|
|
次
|
|
</view>
|
|
</view>
|
|
<view>
|
|
<view>
|
|
@@ -204,7 +204,6 @@ export default {
|
|
ajaxData.orderBy = 'xvfp.not_stock_count desc,xp.code asc';
|
|
ajaxData.orderBy = 'xvfp.not_stock_count desc,xp.code asc';
|
|
}
|
|
}
|
|
this.sortShow = false;
|
|
this.sortShow = false;
|
|
- console.log('11111:',ajaxData);
|
|
|
|
this.loadData(ajaxData);
|
|
this.loadData(ajaxData);
|
|
}
|
|
}
|
|
},
|
|
},
|
|
@@ -212,11 +211,26 @@ export default {
|
|
onReachBottom() {
|
|
onReachBottom() {
|
|
if (this.list.length < this.totalNum) {
|
|
if (this.list.length < this.totalNum) {
|
|
this.pageNo += 1;
|
|
this.pageNo += 1;
|
|
- let ajaxData = {
|
|
|
|
|
|
+ var ajaxData = {
|
|
shelfSn: this.shelfSn,
|
|
shelfSn: this.shelfSn,
|
|
pageNo: this.pageNo,
|
|
pageNo: this.pageNo,
|
|
pageSize: this.pageSize
|
|
pageSize: this.pageSize
|
|
};
|
|
};
|
|
|
|
+ if (this.keyword) {
|
|
|
|
+ var reg = new RegExp('[\\u4E00-\\u9FFF]+', 'g');
|
|
|
|
+ if (reg.test(this.keyword)) {
|
|
|
|
+ ajaxData.productName=this.keyword.trim();
|
|
|
|
+ }else{
|
|
|
|
+ ajaxData.productCode=this.keyword.trim();
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ if (this.isSortFlag == 0) {
|
|
|
|
+ ajaxData.orderBy = 'xvfp.scan_vin_date desc,xp.code asc';
|
|
|
|
+ } else if (this.isSortFlag == 1) {
|
|
|
|
+ ajaxData.orderBy = 'xvfp.in_stock_count desc,xp.code asc';
|
|
|
|
+ } else {
|
|
|
|
+ ajaxData.orderBy = 'xvfp.not_stock_count desc,xp.code asc';
|
|
|
|
+ }
|
|
this.loadData(ajaxData);
|
|
this.loadData(ajaxData);
|
|
} else {
|
|
} else {
|
|
this.status = 'nomore';
|
|
this.status = 'nomore';
|