Skip to content

梁建民 / wmsApp

Go to a project
Commit 14f6116a by LJM
Options

30

parent 7836ed72
Inline Side-by-side
Showing with 108 additions and 25 deletions
pages/arrivalRegister/index.vue
......@@ -487,7 +487,7 @@
duration: 500,
input_flag: false,
page: 1,
limit: 50,
limit: 30,
index: 0,
array: ['全量搜索', '入仓号', 'FedEx'],
list: [],
......@@ -877,7 +877,7 @@
} else {
uni.showToast({
title: res.msg,
icon: 'error'
icon: 'none'
});
}
});
......@@ -1144,6 +1144,7 @@
* 重置
*/
resetChange() {
this.filter_id = [];
this.list = [];
this.page = 1;
},
......
pages/arrivalRegister/registered.vue
......@@ -166,7 +166,7 @@
input_flag: false,
all_flag: false, //全选标记
page: 1,
limit: 50,
limit: 30,
index: 0,
array: ['全量搜索', '入仓号'],
list: [],
......
pages/picking/index.vue
......@@ -54,6 +54,7 @@
<view class="btn row rowCenter verCenter" @click="take(item.stock_out_id, item.stock_out_sn, item.warehouse_id)">领取</view>
</view>
</view>
<view class="row rowCenter verCenter" v-if="!hasMoreData && page > 1" style="color: #999;font-size: 16rpx;padding: 10px 0;flex: 0 0 100%;font-weight: normal;">--&nbsp;已经到底了&nbsp;--</view>
</view>
<!-- 无数据展示 -->
<view class="no-date column rowCenter verCenter" v-else>
......@@ -74,7 +75,7 @@
input_flag: false,
index: 0,
page: 1,
limit: 1000,
limit: 30,
array: ['出库单号'],
list: [],
searchParams: {
......@@ -82,7 +83,11 @@
}
};
},
onShow() {
onReachBottom() {
if (!this.hasMoreData) {
return;
}
this.page++;
this.getData();
},
onNavigationBarButtonTap(e) {
......@@ -92,6 +97,9 @@
});
}
},
onShow() {
this.getData();
},
methods: {
bindPickerChange: function(e) {
console.log('picker发送选择改变，携带值为', e.detail.value);
......@@ -103,7 +111,12 @@
getData() {
this.request(API.getNoTakeList, 'POST', { page: this.page, limit: this.limit, ...this.searchParams }, false).then(res => {
if (res.code === 0) {
this.list = res.data.list;
if (res.data.total > 0) {
this.hasMoreData = true;
this.list = this.list.concat(res.data.list);
} else {
this.hasMoreData = false;
}
} else {
uni.showToast({
title: res.msg,
......
pages/putaway/index.vue
......@@ -98,7 +98,7 @@
<view class="btn row rowCenter verCenter">上架</view>
</navigator>
</view>
<view class="row rowCenter verCenter" v-if="!hasMoreData && page > 1" style="color: #999;font-size: 22rpx;padding: 10px 0;flex: 0 0 100%;font-weight: normal;">--&nbsp;已经到底了&nbsp;--</view>
<view class="row rowCenter verCenter" v-if="!hasMoreData && page > 1" style="color: #999;font-size: 16rpx;padding: 10px 0;flex: 0 0 100%;font-weight: normal;">--&nbsp;已经到底了&nbsp;--</view>
</view>
<!-- 无数据展示 -->
<view class="no-date column rowCenter verCenter" v-else>
......@@ -157,7 +157,7 @@
is_submit: true,
input_flag: false,
page: 1,
limit: 50,
limit: 16,
index: 0,
array: ['入库批次号', '全量搜索'],
list: [],
......@@ -220,11 +220,21 @@
this.indexPosition = e.detail.value;
this.formParams.position_id = this.position[e.detail.value].value;
} else {
//搜索部分
this.index = e.detail.value;
this.searchParams.search_type = Number(e.detail.value) + 1;
this.search_keyword = '';
this.searchParams.search_keyword = '';
//为了改善体验
if (this.index == 0) {
//搜索入库批次号的时候
this.limit = 16;
} else if (this.index == 1) {
//全量搜索时候
this.limit = 30;
}
this.clearInputAndFocus();
//批量扫描关闭
if (this.index == 1) {
......
pages/putaway/pack.vue
......@@ -42,6 +42,7 @@
<view class="btn row rowCenter verCenter">选择</view>
</navigator>
</view>
<view class="row rowCenter verCenter" v-if="!hasMoreData && page > 1" style="color: #999;font-size: 16rpx;padding: 10px 0;flex: 0 0 100%;font-weight: normal;">--&nbsp;已经到底了&nbsp;--</view>
</view>
<!-- 无数据展示 -->
<view class="no-date column rowCenter verCenter" v-else>
......@@ -60,15 +61,23 @@
is_focus: true, //获取焦点动态化
input_flag: false,
page: 1,
limit: 1000,
limit: 30,
index: 0,
array: ['容器'],
list: [],
hasMoreData: true, //是否分页加载
searchParams: {
container_sn: ''
}
};
},
onReachBottom() {
if (!this.hasMoreData) {
return;
}
this.page++;
this.getData();
},
onNavigationBarButtonTap(e) {
console.log(e);
if (e.index == 0) {
......@@ -121,7 +130,12 @@
getData(callback) {
this.request(API.onShelfByContainerCountList, 'POST', { page: this.page, limit: this.limit, ...this.searchParams }, false).then(res => {
if (res.code === 0) {
this.list = res.data.list;
if (res.data.total > 0) {
this.hasMoreData = true;
this.list = this.list.concat(res.data.list);
} else {
this.hasMoreData = false;
}
typeof callback == 'function' && callback(res.data.list, res.data.msg);
} else {
uni.showToast({
......
pages/putaway/record.vue
......@@ -258,7 +258,7 @@
is_focus: true, //获取焦点动态化
input_flag: false,
page: 1,
limit: 50,
limit: 30,
index: 0,
array: ['全量搜索'],
list: [],
......
pages/stockRecheck/index.vue
......@@ -66,6 +66,7 @@
<navigator :url="'/pages/stockRecheck/sort?stock_out_id=' + item.stock_out_id + '&stock_out_sn=' + item.stock_out_sn + '&warehouse_id=' + item.warehouse_id" class="btn1 row rowCenter verCenter" hover-class="none">选择</navigator>
</view>
</view>
<view class="row rowCenter verCenter" v-if="!hasMoreData && page > 1" style="color: #999;font-size: 16rpx;padding: 10px 0;flex: 0 0 100%;font-weight: normal;">--&nbsp;已经到底了&nbsp;--</view>
</view>
<!-- 无数据展示 -->
<view class="no-date column rowCenter verCenter" v-else>
......@@ -89,19 +90,24 @@
is_focus: true, //获取焦点动态化
input_flag: false,
page: 1,
limit: 1000,
limit: 30,
index: 0,
array: ['出库单号'],
list: [],
filter_list: [], //筛选已选中的列表
filter_id: [], //过滤处理的id
hasMoreData: true, //是否分页加载
searchParams: {
stock_out_status: '5,6,7', //出库单状态
stock_out_sn: '' //出库单号
}
};
},
onShow() {
onReachBottom() {
if (!this.hasMoreData) {
return;
}
this.page++;
this.getData();
},
onNavigationBarButtonTap(e) {
......@@ -111,6 +117,9 @@
});
}
},
onShow() {
this.getData();
},
methods: {
checkboxChange(e) {
console.log('checkbox发送选择改变，携带值为', e.detail.value);
......@@ -181,8 +190,13 @@
getData(callback) {
this.request(API.getToCheckList, 'POST', { page: this.page, limit: this.limit, ...this.searchParams }, false).then(res => {
if (res.code === 0) {
this.list = res.data.list;
this.filter_list = createArray(this.list.length, false);
if (res.data.list.length > 0) {
this.hasMoreData = true;
this.list = this.list.concat(res.data.list);
this.filter_list = createArray(this.list.length, false);
} else {
this.hasMoreData = false;
}
typeof callback == 'function' && callback(res.data.list, res.data.msg);
} else {
uni.showToast({
......
pages/stocktake/list.vue
......@@ -42,6 +42,7 @@
<navigator class="btn row rowCenter verCenter" :url="'/pages/stocktake/operate?stocktake_id=' + item.stocktake_id + '&stocktake_sn=' + item.stocktake_sn">选择</navigator>
</view>
</view>
<view class="row rowCenter verCenter" v-if="!hasMoreData && page > 1" style="color: #999;font-size: 16rpx;padding: 10px 0;flex: 0 0 100%;font-weight: normal;">--&nbsp;已经到底了&nbsp;--</view>
</view>
<!-- 无数据展示 -->
<view class="no-date column rowCenter verCenter" v-else>
......@@ -61,7 +62,8 @@
input_flag: false,
index: 0,
page: 1,
limit: 1000,
limit: 30,
hasMoreData: true, //是否分页加载
array: ['盘点单号'],
list: [],
searchParams: {
......@@ -72,6 +74,13 @@
onShow() {
this.getData();
},
onReachBottom() {
if (!this.hasMoreData) {
return;
}
this.page++;
this.getData();
},
onNavigationBarButtonTap(e) {
if (e.index == 0) {
uni.navigateTo({
......@@ -90,7 +99,13 @@
getData() {
this.request(API.getStocktakeList, 'POST', { page: this.page, limit: this.limit, ...this.searchParams }, false).then(res => {
if (res.code === 0) {
this.list = res.data.list;
if (res.data.list.length > 0) {
this.hasMoreData = true;
this.list = this.list.concat(res.data.list);
} else {
this.hasMoreData = false;
}
} else {
uni.showToast({
title: res.msg,
......
pages/stocktake/operate.vue
......@@ -122,6 +122,7 @@
<view class="btn3 row rowCenter verCenter" @click="showDrawer(item, 1)">选择</view>
</view>
</view>
<view class="row rowCenter verCenter" v-if="!hasMoreData && page > 1" style="color: #999;font-size: 16rpx;padding: 10px 0;flex: 0 0 100%;font-weight: normal;">--&nbsp;已经到底了&nbsp;--</view>
</view>
<!-- 无数据展示 -->
<view class="no-date column rowCenter verCenter" v-else>
......@@ -341,7 +342,7 @@
remark: '', //盘点备注
list: [],
page: 1,
limit: 50,
limit: 30,
hasMoreData: true, //是否分页加载
stocktake_sn: '',
detail: {},
......
pages/tallyReceive/index.vue
......@@ -122,7 +122,7 @@
<view class="btn row rowCenter verCenter">理货</view>
</navigator>
</view>
<view class="row rowCenter verCenter" v-if="!hasMoreData && page > 1" style="color: #999;font-size: 22rpx;padding: 10px 0;flex: 0 0 100%;font-weight: normal;">--&nbsp;已经到底了&nbsp;--</view>
<view class="row rowCenter verCenter" v-if="!hasMoreData && page > 1" style="color: #999;font-size: 16rpx;padding: 10px 0;flex: 0 0 100%;font-weight: normal;">--&nbsp;已经到底了&nbsp;--</view>
</view>
<view class="no-date column rowCenter verCenter" v-else>
<text class="iconfont icon-a-juxing21"></text>
......@@ -214,7 +214,7 @@
company_id: uni.getStorageSync('company_id') || 1, //公司组织
all_flag: false, //全选标记
page: 1,
limit: 50, //分页限制数量
limit: 30, //分页限制数量
index: 0,
indexContainer: -1,
array: ['全量搜索', '入仓号', 'FedEx', 'DigKey', 'Rochester'],
......
pages/tallyReceive/record.vue
......@@ -141,7 +141,7 @@
<view class="detail-btn row rowCenter verCenter" @click="showDrawer(item)">详情</view>
</view>
</view>
<view class="row rowCenter verCenter" v-if="!hasMoreData && page > 1" style="color: #999;font-size: 22rpx;padding: 10px 0;flex: 0 0 100%;font-weight: normal;">--&nbsp;已经到底了&nbsp;--</view>
<view class="row rowCenter verCenter" v-if="!hasMoreData && page > 1" style="color: #999;font-size: 16rpx;padding: 10px 0;flex: 0 0 100%;font-weight: normal;">--&nbsp;已经到底了&nbsp;--</view>
</view>
<view class="no-date column rowCenter verCenter" v-else>
<text class="iconfont icon-a-juxing21"></text>
......@@ -409,7 +409,7 @@
return {
is_focus: true, //获取焦点动态化
page: 1,
limit: 50, //分页限制数量
limit: 30, //分页限制数量
input_flag: false,
index: 0,
curr: 0,
......
pages/transfer/index.vue
......@@ -44,6 +44,7 @@
<view class="btn row rowCenter verCenter">选择</view>
</navigator>
</view>
<view class="row rowCenter verCenter" v-if="!hasMoreData && page > 1" style="color: #999;font-size: 16rpx;padding: 10px 0;flex: 0 0 100%;font-weight: normal;">--&nbsp;已经到底了&nbsp;--</view>
</view>
<!-- 无数据展示 -->
<view class="no-date column rowCenter verCenter" v-else>
......@@ -64,7 +65,8 @@
is_focus: true, //获取焦点动态化
input_flag: false,
page: 1,
limit: 1000,
limit: 30,
hasMoreData: true, //是否分页加载
index: 0,
array: ['移位单号'],
list: [],
......@@ -73,6 +75,13 @@
}
};
},
onReachBottom() {
if (!this.hasMoreData) {
return;
}
this.page++;
this.getData();
},
onShow() {
this.getData();
},
......@@ -87,7 +96,12 @@
getData() {
this.request(API.getTransferList, 'GET', { page: this.page, limit: this.limit, ...this.searchParams }, false).then(res => {
if (res.code === 0) {
this.list = res.data.list;
if (res.data.list.length > 0) {
this.hasMoreData = true;
this.list = this.list.concat(res.data.list);
} else {
this.hasMoreData = false;
}
} else {
uni.showToast({
title: res.msg,
......
pages/transfer/record.vue
......@@ -119,6 +119,7 @@
<text class="text">{{ item.exec_time }}</text>
</view>
</view>
<view class="row rowCenter verCenter" v-if="!hasMoreData && page > 1" style="color: #999;font-size: 16rpx;padding: 10px 0;flex: 0 0 100%;font-weight: normal;">--&nbsp;已经到底了&nbsp;--</view>
</view>
<!-- 无数据展示 -->
<view class="no-date column rowCenter verCenter" v-else>
......@@ -140,7 +141,7 @@
array: ['全量搜索', '旧标签'],
input_flag: false,
page: 1,
limit: 50,
limit: 30,
list: [],
hasMoreData: true, //是否分页加载
searchParams: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment