Commit a1833f02 by LJM

app

parent c07a19a2
......@@ -104,7 +104,7 @@
<view class="row verCenter">
<view class="bar row verCenter" style="flex: 0 0 40%;">
<text class="tt">标准品牌:</text>
<text class="yy">{{ item.brand_name }}</text>
<text class="yy">{{ item.cccc }}</text>
</view>
<view class="bar row verCenter" style="flex: 0 0 30%;">
<text class="tt">数量:</text>
......
......@@ -18,31 +18,31 @@
</view>
</view>
<view class="list row bothSide" v-if="list.length > 0">
<navigator class="box" v-for="(item, index) in list" :key="index" url="/pages/picking/sort" hover-class="none">
<navigator class="box" v-for="(item, index) in list" :key="index" :url="'/pages/picking/sort?stock_out_id=' + item.stock_out_id" hover-class="none">
<view class="text-item row verCenter">
<text class="label">出库单号:</text>
<text class="t1"></text>
<text class="t1">{{ item.stock_out_sn }}</text>
</view>
<view class="text-item row verCenter">
<text class="label">状 态:</text>
<text class="t1">全部锁库</text>
<text class="t1">{{ item.stock_out_status_val }}</text>
</view>
<view class="bor row"></view>
<view class="text-item row verCenter">
<text class="label">任 务 数:</text>
<text class="tt">8</text>
<text class="tt">{{ item.items_num }}</text>
</view>
<view class="text-item row verCenter">
<text class="label">总 数 量:</text>
<text class="tt">5000</text>
<text class="tt">{{ item.total_qty }}</text>
</view>
<view class="text-item row verCenter">
<text class="label">上游备注:</text>
<text class="tt">我是一条备注我是一条备注我是一条备注我是一条备注</text>
<text class="tt">{{ item.upstream_remark }}</text>
</view>
<view class="text-item row verCenter">
<text class="label">销售员:</text>
<text class="tt">朱国军</text>
<text class="tt">{{ item.sale_name }}</text>
</view>
<view class="btn-box row"><view class="btn row rowCenter verCenter">领取</view></view>
</navigator>
......@@ -57,7 +57,6 @@
<script>
import { API } from '@/util/api.js';
import { createArray } from '@/util/util.js';
import debounce from 'lodash/debounce';
export default {
......@@ -69,15 +68,14 @@ export default {
limit: 1000,
array: ['出库单号'],
list: [],
filter_list: [], //筛选已选中的列表
filter_id: [], //过滤处理的id
searchParams: {
stock_out_sn: '',
stock_out_id: 4
stock_out_sn: ''
}
};
},
onLoad() {},
onShow() {
this.getData();
},
onNavigationBarButtonTap(e) {
if (e.index == 0) {
uni.navigateTo({
......@@ -94,10 +92,9 @@ export default {
* 获取列表数据
*/
getData() {
this.request(API.getPickedList, 'POST', { page: this.page, limit: this.limit, ...this.searchParams }, false).then(res => {
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;
this.filter_list = createArray(this.list.length, false);
} else {
uni.showToast({
title: res.msg,
......
......@@ -10,106 +10,134 @@
<view class="search-bar row bothSide verCenter">
<view class="row verCenter">
<text class="iconfont icon-juxing1"></text>
<input class="uni-input" placeholder="请扫描或输入库位" placeholder-style="color:#919399" />
<input class="uni-input" placeholder="请扫描或输入库位" placeholder-style="color:#919399" v-model="searchParams.position_name" @input="handleInput(1,searchParams.position_name)" />
</view>
<text class="iconfont icon-a-juxing11"></text>
<text class="iconfont icon-a-juxing11" @click="clearInput(1)" v-if="input_flag_position_name"></text>
</view>
</view>
<view class="right">
<view class="title">入库批次号:</view>
<view class="search-bar row bothSide verCenter">
<view class="row verCenter">
<text class="iconfont icon-juxing1"></text>
<input class="uni-input" placeholder="请扫描或输入入库批次号" placeholder-style="color:#919399" />
</view>
<text class="iconfont icon-a-juxing11"></text>
</view>
<template v-if="curr == 0">
<view class="title">入库批次号:</view>
<view class="search-bar row bothSide verCenter">
<view class="row verCenter">
<text class="iconfont icon-juxing1"></text>
<input class="uni-input" placeholder="请扫描或输入入库批次号" placeholder-style="color:#919399" v-model="searchParams.stock_in_batch_sn" @input="handleInput(2,searchParams.stock_in_batch_sn)" />
</view>
<text class="iconfont icon-a-juxing11" @click="clearInput(2)" v-if="input_flag_stock_in_batch_sn"></text>
</view>
</template>
<template v-else-if="curr == 1">
<view class="title">容器:</view>
<view class="search-bar row bothSide verCenter">
<view class="row verCenter">
<text class="iconfont icon-juxing1"></text>
<input class="uni-input" placeholder="请扫描或输入容器" placeholder-style="color:#919399" v-model="searchParams.container_sn" @input="handleInput(3,searchParams.container_sn)" />
</view>
<text class="iconfont icon-a-juxing11" @click="clearInput(3)" v-if="input_flag_container_sn"></text>
</view>
</template>
</view>
</view>
<view class="list" v-if="curr == 0">
<view class="box row" v-for="(item, index) in 15">
<view class="input-box row verCenter">
<text class="label">库 位:</text>
<text class="tt">A65512</text>
</view>
<view class="input-box row verCenter">
<text class="label">入库批次号:</text>
<text class="text">L-ASN2201010001</text>
</view>
<view class="bor"></view>
<view class="input-box row verCenter">
<text class="label">货品编码:</text>
<text class="text">L-ASN2201010001</text>
</view>
<view class="input-box row verCenter">
<text class="label">货品名称:</text>
<text class="text">A65512</text>
</view>
<view class="input-box row verCenter">
<text class="label">标准品牌:</text>
<text class="text">TI</text>
</view>
<view class="input-box row verCenter">
<text class="label">D / C:</text>
<text class="text">22+</text>
</view>
<view class="input-box row verCenter">
<text class="label">产 地:</text>
<text class="text">C12345</text>
</view>
<view class="input-box row verCenter">
<text class="label">货品品质:</text>
<text class="text">良品</text>
</view>
<view class="input-box row verCenter">
<text class="label">入 仓 号:</text>
<text class="text">C12345</text>
</view>
<view class="input-box row verCenter">
<text class="label">其他批次属性:</text>
<text class="text">-</text>
</view>
<view class="input-box row verCenter">
<text class="label">应拣数量:</text>
<text class="text" style="color: #F98119;">2121</text>
</view>
<view class="input-box row verCenter">
<text class="label">销 售 员:</text>
<text class="text">朱国军:</text>
<!-- 按货品拣货列表 -->
<template v-if="curr == 0">
<view class="list" v-if="list.length > 0">
<view class="box row" v-for="(item, index) in list" :key="index">
<view class="input-box row verCenter">
<text class="label">库 位:</text>
<text class="tt">{{ item.position_name }}</text>
</view>
<view class="input-box row verCenter">
<text class="label">入库批次号:</text>
<text class="text"{{item.stock_in_batch_sn}}</text>
</view>
<view class="bor"></view>
<view class="input-box row verCenter">
<text class="label">货品编码:</text>
<text class="text">{{item.goods_sn}}</text>
</view>
<view class="input-box row verCenter">
<text class="label">货品名称:</text>
<text class="text">{{item.goods_name}}</text>
</view>
<view class="input-box row verCenter">
<text class="label">标准品牌:</text>
<text class="text">{{item.goods_name}}</text>
</view>
<view class="input-box row verCenter">
<text class="label">D / C:</text>
<text class="text">{{item.stock_in_batch_sn}}</text>
</view>
<view class="input-box row verCenter">
<text class="label">产 地:</text>
<text class="text">{{item.coo}}</text>
</view>
<view class="input-box row verCenter">
<text class="label">货品品质:</text>
<text class="text">{{item.quality_val}}</text>
</view>
<view class="input-box row verCenter">
<text class="label">入 仓 号:</text>
<text class="text">{{item.inhouse}}</text>
</view>
<view class="input-box row verCenter">
<text class="label">其他批次属性:</text>
<text class="text">{{item.other_batch_attr}}</text>
</view>
<view class="input-box row verCenter">
<text class="label">应拣数量:</text>
<text class="text" style="color: #F98119;">{{item.pick_qty}}</text>
</view>
<view class="input-box row verCenter">
<text class="label">销 售 员:</text>
<text class="text">{{item.sale_name}}</text>
</view>
<view class="btn row rowCenter verCenter" @click="showDrawer(1)">拣货</view>
</view>
<view class="btn row rowCenter verCenter" @click="showDrawer(1)">拣货</view>
</view>
</view>
<view class="list-style row bothSide" v-if="curr == 1">
<view class="box" v-for="(item, index) in 15">
<view class="input-box row verCenter">
<text class="label">库 位:</text>
<text class="tt">A65512</text>
</view>
<view class="input-box row verCenter">
<text class="label">容 器:</text>
<text class="tt">L-ASN2201010001</text>
</view>
<view class="bor"></view>
<view class="input-box row verCenter">
<text class="label">任 务 数:</text>
<text class="text">88</text>
</view>
<view class="input-box row verCenter">
<text class="label">货品名称:</text>
<text class="text">A65512</text>
</view>
<view class="input-box row verCenter">
<text class="label">合计应拣数量:</text>
<text class="text">TI</text>
</view>
<view class="input-box row verCenter">
<text class="label">销 售 员:</text>
<text class="text">朱国军</text>
</view>
<view class="btn row rowCenter verCenter" @click="showDrawer(2)">选择</view>
<!-- 无数据展示 -->
<view class="no-date column rowCenter verCenter" v-else>
<text class="iconfont icon-a-juxing21"></text>
<text class="text">查不到当前数据</text>
</view>
</view>
</template>
<!-- 按容器拣货列表 -->
<template v-else-if="curr == 1">
<view class="list-style row bothSide" v-if="list.length > 0">
<view class="box" v-for="(item, index) in list" :key="index">
<view class="input-box row verCenter">
<text class="label">库 位:</text>
<text class="tt">A65512</text>
</view>
<view class="input-box row verCenter">
<text class="label">容 器:</text>
<text class="tt">L-ASN2201010001</text>
</view>
<view class="bor"></view>
<view class="input-box row verCenter">
<text class="label">任 务 数:</text>
<text class="text">88</text>
</view>
<view class="input-box row verCenter">
<text class="label">货品名称:</text>
<text class="text">A65512</text>
</view>
<view class="input-box row verCenter">
<text class="label">合计应拣数量:</text>
<text class="text">TI</text>
</view>
<view class="input-box row verCenter">
<text class="label">销 售 员:</text>
<text class="text">朱国军</text>
</view>
<view class="btn row rowCenter verCenter" @click="showDrawer(2)">选择</view>
</view>
</view>
<!-- 无数据展示 -->
<view class="no-date column rowCenter verCenter" v-else>
<text class="iconfont icon-a-juxing21"></text>
<text class="text">查不到当前数据</text>
</view>
</template>
</view>
<!-- 按货品拣货详情弹窗 -->
<uni-drawer ref="showRight" mode="right">
......@@ -291,11 +319,25 @@
<script>
import { API } from '@/util/api.js';
import debounce from 'lodash/debounce';
export default {
data() {
return {
input_flag_position_name:false,
input_flag_stock_in_batch_sn:false,
input_flag_container_sn:false,
page: 1,
limit: 1000,
curr: 0,
itemArr: ['按货品拣货', '按容器拣货']
itemArr: ['按货品拣货', '按容器拣货'],
list: [],
detail:{},
searchParams: {
stock_out_id: '',
position_name: '',
stock_in_batch_sn: '',
container_sn:''
}
};
},
onNavigationBarButtonTap(e) {
......@@ -305,7 +347,12 @@ export default {
});
}
},
onLoad() {},
onLoad(options) {
this.searchParams.stock_out_id = options.stock_out_id || '';
},
onShow() {
this.getData();
},
methods: {
tab(index) {
this.curr = index;
......@@ -323,7 +370,62 @@ export default {
} else if (type == 2) {
this.$refs.showRightPack.close();
}
}
},
/**
* 获取列表数据
*/
getData() {
this.request(API.getLockedList, 'POST', { page: this.page, limit: this.limit, ...this.searchParams }, false).then(res => {
if (res.code === 0) {
this.list = res.data.list;
} else {
uni.showToast({
title: res.msg,
icon: 'error'
});
}
});
},
/**
* 清空数据
*/
clearInput(type) {
if (type == 1) {
this.searchParams.position_name = '';
this.input_flag_position_name = false;
} else if (type == 2) {
this.searchParams.stock_in_batch_sn = '';
this.input_flag_stock_in_batch_sn = false;
} else if (type == 3) {
this.searchParams.container_sn = '';
this.input_flag_container_sn = false;
}
this.getData();
},
/**
* 单号搜索
* @param {Object} event
*/
handleInput: debounce(function(type, val) {
if (val) {
if (type == 1) {
this.input_flag_position_name = true;
} else if (type == 2) {
this.input_flag_stock_in_batch_sn = true;
} else if (type == 3) {
this.input_flag_container_sn = true;
}
} else {
if (type == 1) {
this.input_flag_position_name = false;
} else if (type == 2) {
this.input_flag_stock_in_batch_sn = false;
} else if (type == 3) {
this.input_flag_container_sn = false;
}
}
this.getData();
}, 500)
}
};
</script>
......
......@@ -65,13 +65,15 @@ export default {
index: 0,
array: ['移位单号'],
list: [],
filter_list: [], //筛选已选中的列表
searchParams: {
transfer_sn: '' //移位单号
}
};
},
onLoad() {},
onShow() {
this.getData();
},
methods: {
bindPickerChange: function(e) {
console.log('picker发送选择改变,携带值为', e.detail.value);
......@@ -84,7 +86,6 @@ export default {
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;
this.filter_list = createArray(this.list.length, false);
} else {
uni.showToast({
title: res.msg,
......
......@@ -64,6 +64,14 @@ const API = {
* */
confirmTransfer: API_BASE + '/api/transfer/confirmTransfer',
/**
* 拣货-未领取列表
* */
getNoTakeList: API_BASE + '/api/stockOut/getNoTakeList',
/**
* 拣货-锁库明细列表
* */
getLockedList: API_BASE + '/api/stockOut/getLockedList',
/**
* 上传文件
* */
upload: API_BASE_LIEXIN + '/oss/upload',
......
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