Skip to content

梁建民 / wmsApp

Go to a project
Commit 99aefde9 by LJM
Options

css

parent fd523a19
Inline Side-by-side
Showing with 133 additions and 25 deletions
assets/css/putaway/single.scss
...@@ -202,7 +202,7 @@ ...@@ -202,7 +202,7 @@
bottom: 0; bottom: 0;
width: 100%; width: 100%;
left: 0; left: 0;
z-index: 999; z-index: 9999999999999;
.btn1 { .btn1 {
width: 100%; width: 100%;
height: 75rpx; height: 75rpx;
......
pages.json
...@@ -248,7 +248,19 @@ ...@@ -248,7 +248,19 @@
}, { }, {
"path": "pages/stockRecheck/record", "path": "pages/stockRecheck/record",
"style": { "style": {
"navigationBarTitleText": "复核记录" "navigationBarTitleText": "复核记录",
"app-plus": {
"titleNView": {
"buttons": [{
"index": "0",
"text": "首页",
"fontSize": "15px",
"color": "#1969F9",
"float": "right",
"width": "100px"
}]
}
}
} }
}, { }, {
"path": "pages/stockRecheck/print", "path": "pages/stockRecheck/print",
......
pages/arrivalRegister/index.vue
...@@ -179,7 +179,7 @@ export default { ...@@ -179,7 +179,7 @@ export default {
return { return {
input_flag: false, input_flag: false,
page: 1, page: 1,
limit: 1000, limit: 10,
index: 0, index: 0,
array: ['物流单号', '入库单号', '入仓号'], array: ['物流单号', '入库单号', '入仓号'],
list: [], list: [],
...@@ -188,6 +188,7 @@ export default { ...@@ -188,6 +188,7 @@ export default {
detail: {}, //详情的数据 detail: {}, //详情的数据
warehouse_id_index: 0, warehouse_id_index: 0,
warehouse_id_data: [], warehouse_id_data: [],
hasMoreData: true, //是否分页加载
searchParams: { searchParams: {
stock_in_sn: '', //入库单号 stock_in_sn: '', //入库单号
tracking_no: '', //物流单号 tracking_no: '', //物流单号
...@@ -201,6 +202,13 @@ export default { ...@@ -201,6 +202,13 @@ export default {
} }
}; };
}, },
onReachBottom() {
if (!this.hasMoreData) {
return;
}
this.page++;
this.getData();
},
onNavigationBarButtonTap(e) { onNavigationBarButtonTap(e) {
if (e.index == 0) { if (e.index == 0) {
uni.navigateTo({ uni.navigateTo({
...@@ -315,8 +323,13 @@ export default { ...@@ -315,8 +323,13 @@ export default {
getData() { getData() {
this.request(API.stockInMobileRegisterList, 'POST', { page: this.page, limit: this.limit, is_register: 0, ...this.searchParams }, false).then(res => { this.request(API.stockInMobileRegisterList, 'POST', { page: this.page, limit: this.limit, is_register: 0, ...this.searchParams }, false).then(res => {
if (res.code === 0) { if (res.code === 0) {
this.list = res.data.list; if (res.data.total > 0) {
this.filter_list = createArray(this.list.length, false); this.hasMoreData = true;
this.list = this.list.concat(res.data.list);
this.filter_list = createArray(this.list.length, false);
} else {
this.hasMoreData = false;
}
} else { } else {
uni.showToast({ uni.showToast({
title: res.msg, title: res.msg,
......
pages/picking/record.vue
...@@ -96,7 +96,8 @@ export default { ...@@ -96,7 +96,8 @@ export default {
input_flag: false, input_flag: false,
all_flag: false, //全选标记 all_flag: false, //全选标记
page: 1, page: 1,
limit: 1000, limit: 10,
hasMoreData: true, //是否分页加载
list: [], list: [],
filter_list: [], //筛选已选中的列表 filter_list: [], //筛选已选中的列表
filter_id: [], //过滤id filter_id: [], //过滤id
...@@ -105,6 +106,13 @@ export default { ...@@ -105,6 +106,13 @@ export default {
} }
}; };
}, },
onReachBottom() {
if (!this.hasMoreData) {
return;
}
this.page++;
this.getData();
},
onLoad(options) { onLoad(options) {
this.searchParams.stock_out_sn = options.stock_out_sn; this.searchParams.stock_out_sn = options.stock_out_sn;
}, },
...@@ -216,10 +224,15 @@ export default { ...@@ -216,10 +224,15 @@ export default {
* 获取列表数据 * 获取列表数据
*/ */
getData() { getData() {
this.request(API.getAllPickedList, 'POST', { page: this.page, limit: this.limit, ...this.searchParams }, true).then(res => { this.request(API.getAllPickedList, 'POST', { page: this.page, limit: this.limit, ...this.searchParams }, false).then(res => {
if (res.code === 0) { if (res.code === 0) {
this.list = res.data.list; if (res.data.list.length > 0) {
this.filter_list = createArray(this.list.length, false); this.hasMoreData = true;
this.list = this.list.concat(res.data.list);
this.filter_list = createArray(this.list.length, false);
} else {
this.hasMoreData = false;
}
} else { } else {
uni.showToast({ uni.showToast({
title: res.msg, title: res.msg,
......
pages/putaway/record.vue
...@@ -256,13 +256,14 @@ export default { ...@@ -256,13 +256,14 @@ export default {
return { return {
input_flag: false, input_flag: false,
page: 1, page: 1,
limit: 1000, limit: 10,
index: 0, index: 0,
array: ['入库单号', '入库批次号', '销售员', '入仓号', '理货容器'], array: ['入库单号', '入库批次号', '销售员', '入仓号', '理货容器'],
list: [], list: [],
filter_list: [], //筛选已选中的列表 filter_list: [], //筛选已选中的列表
filter_id: [], //过滤处理的id filter_id: [], //过滤处理的id
detail: {}, detail: {},
hasMoreData: true, //是否分页加载
searchParams: { searchParams: {
stock_in_type: '', stock_in_type: '',
search_type: 1, search_type: 1,
...@@ -271,6 +272,13 @@ export default { ...@@ -271,6 +272,13 @@ export default {
} }
}; };
}, },
onReachBottom() {
if (!this.hasMoreData) {
return;
}
this.page++;
this.getData();
},
onNavigationBarButtonTap(e) { onNavigationBarButtonTap(e) {
if (e.index == 0) { if (e.index == 0) {
uni.reLaunch({ uni.reLaunch({
...@@ -288,6 +296,8 @@ export default { ...@@ -288,6 +296,8 @@ export default {
} else if (type == 2) { } else if (type == 2) {
this.searchParams.shelf_status = e.detail.value; this.searchParams.shelf_status = e.detail.value;
} }
this.page = 1;
this.list = [];
this.getData(); this.getData();
}, },
bindPickerChange: function(e) { bindPickerChange: function(e) {
...@@ -362,10 +372,15 @@ export default { ...@@ -362,10 +372,15 @@ export default {
* 获取列表数据 * 获取列表数据
*/ */
getData() { getData() {
this.request(API.onShelfRecordList, 'GET', { page: this.page, limit: this.limit, ...this.searchParams }, true).then(res => { this.request(API.onShelfRecordList, 'GET', { page: this.page, limit: this.limit, ...this.searchParams }, false).then(res => {
if (res.code === 0) { if (res.code === 0) {
this.list = res.data.list; if (res.data.total > 0) {
this.filter_list = createArray(this.list.length, false); this.hasMoreData = true;
this.list = this.list.concat(res.data.list);
this.filter_list = createArray(this.list.length, false);
} else {
this.hasMoreData = false;
}
} else { } else {
uni.showToast({ uni.showToast({
title: res.msg, title: res.msg,
......
pages/stockRecheck/record.vue
...@@ -88,13 +88,28 @@ export default { ...@@ -88,13 +88,28 @@ export default {
data() { data() {
return { return {
page: 1, page: 1,
limit: 10000, limit: 10,
list: [], list: [],
stock_out_sn: '', stock_out_sn: '',
hasMoreData: true, //是否分页加载
filter_list: [], //筛选已选中的列表 filter_list: [], //筛选已选中的列表
filter_id: [] //过滤处理的id filter_id: [] //过滤处理的id
}; };
}, },
onNavigationBarButtonTap(e) {
if (e.index == 0) {
uni.reLaunch({
url: '/pages/index/index'
});
}
},
onReachBottom() {
if (!this.hasMoreData) {
return;
}
this.page++;
this.getData();
},
onLoad(options) { onLoad(options) {
this.stock_out_sn = options.stock_out_sn; this.stock_out_sn = options.stock_out_sn;
}, },
...@@ -142,10 +157,15 @@ export default { ...@@ -142,10 +157,15 @@ export default {
* 获取列表数据 * 获取列表数据
*/ */
getData() { getData() {
this.request(API.getAllCheckedItemList, 'POST', { page: this.page, limit: this.limit, stock_out_sn: this.stock_out_sn }, true).then(res => { this.request(API.getAllCheckedItemList, 'POST', { page: this.page, limit: this.limit, stock_out_sn: this.stock_out_sn }, false).then(res => {
if (res.code === 0) { if (res.code === 0) {
this.list = res.data.list; if (res.data.list.length > 0) {
this.filter_list = createArray(this.list.length, false); this.hasMoreData = true;
this.list = this.list.concat(res.data.list);
this.filter_list = createArray(this.list.length, false);
} else {
this.hasMoreData = false;
}
} else { } else {
uni.showToast({ uni.showToast({
title: res.msg, title: res.msg,
......
pages/tallyReceive/index.vue
...@@ -163,7 +163,7 @@ export default { ...@@ -163,7 +163,7 @@ export default {
input_contaion: false, input_contaion: false,
all_flag: false, //全选标记 all_flag: false, //全选标记
page: 1, page: 1,
limit: 1000, limit: 10,
index: 0, index: 0,
indexContainer: -1, indexContainer: -1,
array: ['物流单号', '入库单号', '入仓号'], array: ['物流单号', '入库单号', '入仓号'],
...@@ -173,6 +173,7 @@ export default { ...@@ -173,6 +173,7 @@ export default {
detail: {}, //详情的数据 detail: {}, //详情的数据
image_list: [], //图片列表 image_list: [], //图片列表
maxNum: 10, //最大上传图片数量 maxNum: 10, //最大上传图片数量
hasMoreData: true, //是否分页加载
searchParams: { searchParams: {
stock_in_sn: '', //入库单号 stock_in_sn: '', //入库单号
tracking_no: '', //物流单号 tracking_no: '', //物流单号
...@@ -188,6 +189,13 @@ export default { ...@@ -188,6 +189,13 @@ export default {
} }
}; };
}, },
onReachBottom() {
if (!this.hasMoreData) {
return;
}
this.page++;
this.getData();
},
onNavigationBarButtonTap(e) { onNavigationBarButtonTap(e) {
if (e.index == 0) { if (e.index == 0) {
uni.navigateTo({ uni.navigateTo({
...@@ -350,8 +358,13 @@ export default { ...@@ -350,8 +358,13 @@ export default {
getData() { getData() {
this.request(API.waitTallyReceiveList, 'POST', { page: this.page, limit: this.limit, ...this.searchParams }, false).then(res => { this.request(API.waitTallyReceiveList, 'POST', { page: this.page, limit: this.limit, ...this.searchParams }, false).then(res => {
if (res.code === 0) { if (res.code === 0) {
this.list = res.data.list; if (res.data.total > 0) {
this.filter_list = createArray(this.list.length, false); this.hasMoreData = true;
this.list = this.list.concat(res.data.list);
this.filter_list = createArray(this.list.length, false);
} else {
this.hasMoreData = false;
}
} else { } else {
uni.showToast({ uni.showToast({
title: res.msg, title: res.msg,
......
pages/tallyReceive/record.vue
...@@ -213,7 +213,7 @@ ...@@ -213,7 +213,7 @@
<view class="box" v-for="(item, index) in image_list" :key="index"><image @click="previewChange(image_list, index)" :src="item" mode="aspectFill" lazy-load="true"></image></view> <view class="box" v-for="(item, index) in image_list" :key="index"><image @click="previewChange(image_list, index)" :src="item" mode="aspectFill" lazy-load="true"></image></view>
</view> </view>
</view> </view>
<view class="btn row verCenter bothSide"><view class="btn1 row rowCenter verCenter" @click="cancelTallyReceive(2, detail.tally_id)">取消理货</view></view> <view class="btn row verCenter bothSide"><view class="btn1 row rowCenter verCenter" @click="cancelTallyReceive(2, detail.tally_id, detail.stock_in_item_id)">取消理货</view></view>
</view> </view>
</uni-drawer> </uni-drawer>
</view> </view>
...@@ -227,6 +227,8 @@ import { createArray } from '@/util/util.js'; ...@@ -227,6 +227,8 @@ import { createArray } from '@/util/util.js';
export default { export default {
data() { data() {
return { return {
page: 1,
limit: 10,
input_flag: false, input_flag: false,
index: 0, index: 0,
array: ['物流单号', '入库单号', '入仓号'], array: ['物流单号', '入库单号', '入仓号'],
...@@ -235,6 +237,7 @@ export default { ...@@ -235,6 +237,7 @@ export default {
filter_id: [], //入库单列表的入库登记 filter_id: [], //入库单列表的入库登记
detail: {}, //详情的数据 detail: {}, //详情的数据
image_list: [], //图片列表 image_list: [], //图片列表
hasMoreData: true, //是否分页加载
searchParams: { searchParams: {
stock_in_sn: '', //入库单号 stock_in_sn: '', //入库单号
tracking_no: '', //物流单号 tracking_no: '', //物流单号
...@@ -245,6 +248,13 @@ export default { ...@@ -245,6 +248,13 @@ export default {
} }
}; };
}, },
onReachBottom() {
if (!this.hasMoreData) {
return;
}
this.page++;
this.getData();
},
onNavigationBarButtonTap(e) { onNavigationBarButtonTap(e) {
if (e.index == 0) { if (e.index == 0) {
uni.reLaunch({ uni.reLaunch({
...@@ -262,6 +272,8 @@ export default { ...@@ -262,6 +272,8 @@ export default {
} else if (type == 2) { } else if (type == 2) {
this.searchParams.tally_status = e.detail.value; this.searchParams.tally_status = e.detail.value;
} }
this.page = 1;
this.list = [];
this.getData(); this.getData();
}, },
bindPickerChange: function(e) { bindPickerChange: function(e) {
...@@ -355,8 +367,13 @@ export default { ...@@ -355,8 +367,13 @@ export default {
getData() { getData() {
this.request(API.haveTallyReceiveList, 'POST', { page: this.page, limit: this.limit, ...this.searchParams }, false).then(res => { this.request(API.haveTallyReceiveList, 'POST', { page: this.page, limit: this.limit, ...this.searchParams }, false).then(res => {
if (res.code === 0) { if (res.code === 0) {
this.list = res.data.list; if (res.data.total > 0) {
this.filter_list = createArray(this.list.length, false); this.hasMoreData = true;
this.list = this.list.concat(res.data.list);
this.filter_list = createArray(this.list.length, false);
} else {
this.hasMoreData = false;
}
} else { } else {
uni.showToast({ uni.showToast({
title: res.msg, title: res.msg,
...@@ -449,7 +466,7 @@ export default { ...@@ -449,7 +466,7 @@ export default {
/** /**
* 取消理货 * 取消理货
*/ */
cancelTallyReceive(type, ids) { cancelTallyReceive(type, ids, stock_in_item_id) {
if (type == 1) { if (type == 1) {
if (this.filter_id.length == 0) { if (this.filter_id.length == 0) {
uni.showToast({ uni.showToast({
...@@ -459,8 +476,13 @@ export default { ...@@ -459,8 +476,13 @@ export default {
return false; return false;
} }
var tally_id = this.filter_id.join(','); var tally_id = this.filter_id.join(',');
let filter_arr = this.findIndex(this.filter_list, true);
var stock_in_item_id = filter_arr.map(i => this.list[i].stock_in_item_id);
stock_in_item_id = stock_in_item_id.join(',');
} else { } else {
var tally_id = ids; var tally_id = ids;
var stock_in_item_id = stock_in_item_id;
} }
uni.showModal({ uni.showModal({
...@@ -469,7 +491,7 @@ export default { ...@@ -469,7 +491,7 @@ export default {
showCancel: true, showCancel: true,
success: res => { success: res => {
if (res.confirm) { if (res.confirm) {
this.request(API.cancelTallyReceive, 'POST', { tally_id: tally_id }, true).then(res => { this.request(API.cancelTallyReceive, 'POST', { tally_id: tally_id, stock_in_item_id: stock_in_item_id }, true).then(res => {
if (res.code === 0) { if (res.code === 0) {
uni.showToast({ uni.showToast({
title: '取消理货成功', title: '取消理货成功',
......
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