Skip to content

梁建民 / wmsApp

Go to a project
Commit 3b55074f by LJM
Options

WMS--入库单明细增加字段：箱号，及移动端相关操作

parent c809f65a
Inline Side-by-side
Showing with 119 additions and 35 deletions
assets/css/arrivalRegister/index.scss
......@@ -321,8 +321,7 @@
.drawer-list {
.box {
position: relative;
padding: 18rpx 18rpx 0 18rpx;
height: 94rpx;
padding: 18rpx 18rpx 18rpx 18rpx;
background: #ffffff;
box-shadow: 0px 3rpx 3rpx 0px rgba(198, 199, 204, 0.3);
border-radius: 10rpx;
......
pages/arrivalRegister/index.vue
......@@ -37,6 +37,10 @@
<radio value="2" style="transform:scale(0.7)" color="#1969F9" />
<text class="tt">FedEX</text>
</label>
<label class="radio">
<radio value="3" style="transform:scale(0.7)" color="#1969F9" />
<text class="tt">箱号</text>
</label>
</radio-group>
</view>
<view class="total-text">共<text>{{total}}</text>条数据</view>
......@@ -57,6 +61,10 @@
<template v-else-if="index == 2">
<input class="uni-input" placeholder="请输入FedEx" placeholder-style="color:#919399" :focus="is_focus" v-model="searchParams.tracking_no" @input="handleInput(3, $event)" />
</template>
<!-- fedex -->
<template v-else-if="index == 3">
<input class="uni-input" placeholder="请输入箱号" placeholder-style="color:#919399" :focus="is_focus" v-model="searchParams.box_sn" @input="handleInput(4, $event)" />
</template>
</view>
<text class="iconfont icon-a-juxing11" @click="clearInput()" v-if="input_flag"></text>
</view>
......@@ -99,6 +107,10 @@
<text class="label">标准品牌：</text>
<text class="tt">{{ item.stock_in_items[0].brand_name }}</text>
</view>
<view class="text-item row verCenter" v-if="item.stock_in_items[0].box_sn">
<text class="label">箱号：</text>
<text class="tt">{{ item.stock_in_items[0].box_sn }}</text>
</view>
<view class="text-item row verCenter">
<text class="label">预期数量：</text>
<text class="tt">{{ item.stock_in_items[0].expect_qty }}</text>
......@@ -173,12 +185,15 @@
<view class="drawer-list" v-if="detail.stock_in_items">
<scroll-view style="max-height: 755rpx" scroll-y="true">
<view class="box" v-for="(item, index) in detail.stock_in_items" :key="index">
<view class="row bothSide vverCenter top">
<view class="row bothSide verCenter top">
<view class="row verCenter">
<text class="t1">{{ index + 1 }}.</text>
<text class="t2">{{ item.goods_name }}</text>
</view>
<text class="t3">销售员：{{ item.sale_user }}</text>
<view class="row verCenter">
<text class="t3" style="margin-right: 10rpx;" v-if="item.box_sn">箱号：{{ item.box_sn}}</text>
<text class="t3">销售员：{{ item.sale_user }}</text>
</view>
</view>
<view class="row verCenter">
<view class="bar row verCenter" style="width: 40%;">
......@@ -517,7 +532,8 @@
create_time_end: '', //结束日期
mobile_register_all_search: '', //全量搜索
stock_in_with_stock_in_items_inhouse: '', //入仓单号
tracking_no: '' //fedex
tracking_no: '', //fedex
box_sn: '' //箱号
},
maxInputLength: 8,
formParams: {
......@@ -782,6 +798,8 @@
this.resetChange();
this.searchParams.mobile_register_all_search = '';
this.searchParams.stock_in_with_stock_in_items_inhouse = '';
this.searchParams.tracking_no = '';
this.searchParams.box_sn = '';
if (val) {
if (type == 1) {
//全量搜索
......@@ -804,13 +822,15 @@
} else {
this.searchParams.tracking_no = val;
}
} else if (type == 4) {
this.searchParams.box_sn = val;
}
this.input_flag = true;
} else {
this.input_flag = false;
}
this.getData();
}, 800),
}, 500),
/**
* 获取仓库
*/
......
pages/arrivalRegister/registered.vue
......@@ -20,6 +20,9 @@
<template v-else-if="index == 1">
<input class="uni-input" placeholder="请输入入仓号" placeholder-style="color:#919399" :focus="is_focus" v-model="searchParams.stock_in_with_stock_in_items_inhouse" @input="handleInput(2, $event)" :maxlength="maxInputLength" />
</template>
<template v-else-if="index == 2">
<input class="uni-input" placeholder="请输入箱号" placeholder-style="color:#919399" :focus="is_focus" v-model="searchParams.box_sn" @input="handleInput(3, $event)" :maxlength="maxInputLength" />
</template>
</view>
<text class="iconfont icon-a-juxing11" @click="clearInput()" v-if="input_flag"></text>
</view>
......@@ -55,6 +58,10 @@
<text class="label">标准品牌：</text>
<text class="tt">{{ item.stock_in_items[0].brand_name }}</text>
</view>
<view class="text-item row verCenter" v-if="item.stock_in_items[0].box_sn">
<text class="label">箱号：</text>
<text class="tt">{{ item.stock_in_items[0].box_sn }}</text>
</view>
<view class="text-item row verCenter">
<text class="label">预期数量：</text>
<text class="tt">{{ item.stock_in_items[0].expect_qty }}</text>
......@@ -115,12 +122,15 @@
<view class="drawer-list" v-if="detail.stock_in_items">
<scroll-view style="max-height: 60vh" scroll-y="true">
<view class="box" v-for="(item, index) in detail.stock_in_items" :key="index">
<view class="row bothSide vverCenter top">
<view class="row bothSide verCenter top">
<view class="row verCenter">
<text class="t1">{{ index + 1 }}.</text>
<text class="t2">{{ item.goods_name }}</text>
</view>
<text class="t3">销售员：{{ item.sale_user }}</text>
<view class="row verCenter">
<text class="t3" style="margin-right: 10rpx;" v-if="item.box_sn">箱号：{{ item.box_sn}}</text>
<text class="t3">销售员：{{ item.sale_user }}</text>
</view>
</view>
<view class="row verCenter">
<view class="bar row verCenter" style="flex: 0 0 40%;">
......@@ -172,7 +182,7 @@
page: 1,
limit: 30,
index: 0,
array: ['全量搜索', '入仓号'],
array: ['全量搜索', '入仓号', '箱号'],
list: [],
filter_list: [], //筛选已选中的列表
filter_id: [], //过滤id
......@@ -182,7 +192,8 @@
maxInputLength: 7,
searchParams: {
mobile_register_all_search: '', //全量搜索
stock_in_with_stock_in_items_inhouse: '' //入仓单号
stock_in_with_stock_in_items_inhouse: '', //入仓单号
box_sn: '' //箱号
}
};
},
......@@ -271,6 +282,7 @@
var val = event.target.value;
this.searchParams.mobile_register_all_search = '';
this.searchParams.stock_in_with_stock_in_items_inhouse = '';
this.searchParams.box_sn = '';
if (val) {
if (type == 1) {
......@@ -285,6 +297,9 @@
this.maxInputLength = 7;
}
this.searchParams.stock_in_with_stock_in_items_inhouse = val;
} else if (type == 3) {
//箱号
this.searchParams.box_sn = val;
}
this.input_flag = true;
} else {
......
pages/tallyReceive/index.vue
......@@ -20,21 +20,24 @@
<input class="uni-input" placeholder="请输入入仓号" placeholder-style="color:#919399" :focus="is_focus" v-model="searchParams.stock_in_with_stock_in_items_inhouse" @input="handleInput(2, $event)" maxlength="8" />
</template>
<template v-else-if="index == 2">
<input class="uni-input" placeholder="请输入FedEx" placeholder-style="color:#919399" :focus="is_focus" v-model="searchParams.tracking_no" @input="handleInput(0, $event)" />
<input class="uni-input" placeholder="请输入箱号" placeholder-style="color:#919399" :focus="is_focus" v-model="searchParams.box_sn" @input="handleInput(4, $event)" />
</template>
<template v-else-if="index == 3">
<input class="uni-input" maxlength="-1" placeholder="请输入DigiKey" placeholder-style="color:#919399" :focus="is_focus" v-model="searchParams.code_type" @input="handleInputChange($event)" style="width: 100%;" />
<input class="uni-input" placeholder="请输入FedEx" placeholder-style="color:#919399" :focus="is_focus" v-model="searchParams.tracking_no" @input="handleInput(0, $event)" />
</template>
<template v-else-if="index == 4">
<input class="uni-input" maxlength="-1" placeholder="请输入Rochester" placeholder-style="color:#919399" :focus="is_focus" v-model="searchParams.code_type" @input="handleInputChange($event)" style="width: 100%;" />
<input class="uni-input" maxlength="-1" placeholder="请输入DigiKey" placeholder-style="color:#919399" :focus="is_focus" v-model="searchParams.code_type" @input="handleInputChange($event)" style="width: 100%;" />
</template>
<template v-else-if="index == 5">
<input class="uni-input" maxlength="-1" placeholder="请输入TME" placeholder-style="color:#919399" :focus="is_focus" v-model="searchParams.code_type" @input="handleInputChange($event)" style="width: 100%;" />
<input class="uni-input" maxlength="-1" placeholder="请输入Rochester" placeholder-style="color:#919399" :focus="is_focus" v-model="searchParams.code_type" @input="handleInputChange($event)" style="width: 100%;" />
</template>
<template v-else-if="index == 6">
<input class="uni-input" maxlength="-1" placeholder="请输入Chip1stop" placeholder-style="color:#919399" :focus="is_focus" v-model="searchParams.code_type" @input="handleInputChange($event)" style="width: 100%;" />
<input class="uni-input" maxlength="-1" placeholder="请输入TME" placeholder-style="color:#919399" :focus="is_focus" v-model="searchParams.code_type" @input="handleInputChange($event)" style="width: 100%;" />
</template>
<template v-else-if="index == 7">
<input class="uni-input" maxlength="-1" placeholder="请输入Chip1stop" placeholder-style="color:#919399" :focus="is_focus" v-model="searchParams.code_type" @input="handleInputChange($event)" style="width: 100%;" />
</template>
<template v-else-if="index == 8">
<input class="uni-input" maxlength="-1" placeholder="请输入Mouser" placeholder-style="color:#919399" :focus="is_focus" v-model="searchParams.code_type" @input="handleInputChange($event)" style="width: 100%;" />
</template>
</view>
......@@ -73,6 +76,10 @@
<text class="label">入仓号：</text>
<text class="tt">{{ item.inhouse }}</text>
</view>
<view class="text-item row verCenter" v-if="item.box_sn">
<text class="label">箱号：</text>
<text class="tt">{{ item.box_sn }}</text>
</view>
<view class="text-item row verCenter" v-if="item.sku_id > 0">
<text class="label" style="width: 100rpx;">自营货品ID：</text>
<text class="tt">{{ item.sku_id }}</text>
......@@ -222,7 +229,7 @@
limit: 30, //分页限制数量
index: uni.getStorageSync('tallyReceiveIndex') || 0, //记录用户上一次的选择
indexContainer: -1,
array: ['全量搜索', '入仓号', 'FedEx', 'DigiKey', 'Rochester', 'TME', 'Chip1stop', 'Mouser'],
array: ['全量搜索', '入仓号', '箱号', 'FedEx', 'DigiKey', 'Rochester', 'TME', 'Chip1stop', 'Mouser'],
list: [],
filter_list: [], //筛选已选中的列表
filter_id: [], //入库单列表的入库登记
......@@ -240,7 +247,8 @@
container_id: '', //容器id,
tracking_no: '', //fedex
goods_name: '',
code_type: ''
code_type: '',
box_sn: ''
},
formParams: {
container_id: '',
......@@ -439,6 +447,7 @@
this.searchParams.stock_in_with_stock_in_items_inhouse = ''; //清空入仓号字段
this.searchParams.tracking_no = ''; //清空FedEx
this.searchParams.code_type = ''; //清空DigiKey等一系列供应商
this.searchParams.box_sn = '';
this.searchParams.mobile_wait_tally_all_search = val; //赋值全量搜索字段
this.input_flag = true;
......@@ -449,6 +458,7 @@
this.searchParams.mobile_wait_tally_all_search = ''; //清空全量搜索字段
this.searchParams.tracking_no = ''; //清空FedEx
this.searchParams.code_type = ''; //清空DigiKey等一系列供应商
this.searchParams.box_sn = '';
//处理F号开头
var str = val;
......@@ -459,6 +469,16 @@
}
this.input_flag = true;
this.getData();
} else if (type == 4) {
//箱号
this.resetChange();
this.searchParams.mobile_wait_tally_all_search = ''; //清空全量搜索字段
this.searchParams.tracking_no = ''; //清空FedEx
this.searchParams.code_type = ''; //清空DigiKey等一系列供应商
this.searchParams.box_sn = val;
this.input_flag = true;
this.getData();
} else if (type == 3) {
//容器 && 一键理货的容器监听
this.searchParams.container_name = val;
......@@ -471,6 +491,8 @@
this.searchParams.mobile_wait_tally_all_search = ''; //清空全量搜索字段
this.searchParams.stock_in_with_stock_in_items_inhouse = ''; //清空入仓号字段
this.searchParams.code_type = ''; //清空DigiKey等一系列供应商
this.searchParams.box_sn = '';
// 规则处理FedEx截取后12位
let last12 = val.slice(22);
this.searchParams.tracking_no = last12; //赋值FedEx
......@@ -503,11 +525,11 @@
this.resetSearchParams(); //重置参数
this.searchParams.code_type = val; //赋值DigiKey,Rochester,TME,Chip1stop供应商
let codeTypeByIndex = {
3: 'DigiKey',
4: 'Rochester',
5: 'TME',
6: 'Chip1stop',
7: 'Mouser'
4: 'DigiKey',
5: 'Rochester',
6: 'TME',
7: 'Chip1stop',
8: 'Mouser'
};
const codeType = codeTypeByIndex[this.index] || '';
this.input_flag = true;
......@@ -529,6 +551,7 @@
this.searchParams.tracking_no = '';
this.searchParams.goods_name = '';
this.searchParams.code_type = '';
this.searchParams.box_sn = '';
},
/**
* 识别二维码的数量和型号
......
pages/tallyReceive/operate.vue
......@@ -52,10 +52,22 @@
<text class="label">入 仓 号：</text>
<text class="text">{{ detail.inhouse }}</text>
</view>
<view class="item row verCenter" style="flex: 0 0 100%;">
<text class="label">物流单号：</text>
<text class="text">{{ detail.tracking_no }}</text>
</view>
<template v-if="detail.box_sn">
<view class="item row verCenter">
<text class="label">物流单号：</text>
<text class="text">{{ detail.tracking_no }}</text>
</view>
<view class="item row verCenter">
<text class="label">箱号：</text>
<text class="text">{{ detail.box_sn }}</text>
</view>
</template>
<template v-else>
<view class="item row verCenter" style="flex: 0 0 100%;">
<text class="label">物流单号：</text>
<text class="text">{{ detail.tracking_no }}</text>
</view>
</template>
<view class="item row verCenter">
<text class="label">到货时间：</text>
<text class="tt">{{ detail.arrival_time_cn }}</text>
......
pages/tallyReceive/record.vue
......@@ -36,6 +36,9 @@
<template v-else-if="index == 1">
<input class="uni-input" placeholder="请输入入仓号" placeholder-style="color:#919399" :focus="is_focus" v-model="searchParams.stock_in_with_stock_in_items_inhouse" @input="handleInput(2, $event)" />
</template>
<template v-else-if="index == 2">
<input class="uni-input" placeholder="请输入箱号" placeholder-style="color:#919399" :focus="is_focus" v-model="searchParams.box_sn" @input="handleInput(3, $event)" />
</template>
</view>
<text class="iconfont icon-a-juxing11" @click="clearInput()" v-if="input_flag"></text>
</view>
......@@ -105,6 +108,10 @@
<text class="label">入仓号：</text>
<text class="tt">{{ item.inhouse }}</text>
</view>
<view class="text-item row verCenter" v-if="item.box_sn">
<text class="label">箱号：</text>
<text class="tt">{{ item.box_sn }}</text>
</view>
<view class="text-item row verCenter" v-if="item.sku_id > 0">
<text class="label" style="width: 100rpx;">自营货品ID：</text>
<text class="tt">{{ item.sku_id }}</text>
......@@ -175,6 +182,10 @@
<text class="label">入 仓 号：</text>
<text class="text">{{ detail.inhouse }}</text>
</view>
<view class="item row verCenter" v-if="detail.box_sn">
<text class="label">箱号：</text>
<text class="text">{{ detail.box_sn }}</text>
</view>
<view class="item row verCenter">
<text class="label">物流单号：</text>
<text class="text">{{ detail.tracking_no }}</text>
......@@ -416,7 +427,7 @@
curr: 0,
noexebshowFalg: true, //控制是否会触发生命周期
item: ['货品信息', '其他信息'],
array: ['全量搜索', '入仓号'],
array: ['全量搜索', '入仓号', '箱号'],
list: [],
filter_list: [], //筛选已选中的列表
filter_id: [], //入库单列表的入库登记
......@@ -436,6 +447,7 @@
tally_status: 0, //默认显示已理货
stock_tally_with_stock_in_stock_in_type_in: '', //入库类型
watch_all: 0, //1查看所有，0查看自己
box_sn: '' //箱号
},
changeStockTallyImagesParams: {
tally_id: '',
......@@ -660,11 +672,14 @@
var val = event.target.value;
this.searchParams.mobile_have_tally_all_search = '';
this.searchParams.stock_in_with_stock_in_items_inhouse = '';
this.searchParams.box_sn = '';
if (val) {
if (type == 1) {
this.searchParams.mobile_have_tally_all_search = val;
} else if (type == 2) {
this.searchParams.stock_in_with_stock_in_items_inhouse = val;
} else if (type == 3) {
this.searchParams.box_sn = val;
}
this.input_flag = true;
} else {
......
util/api.js
// const API_BASE_USER = 'http://user.liexindev.net'; //用户系统
// const API_BASE_PUR = 'http://pur.liexindev.net'; //采购系统
// const API_BASE = 'http://wms.liexindev.net'; //WMS系统
// const API_BASE_OSS = 'http://image.liexindev.net'; //oss系统
const API_BASE_USER = 'http://user.liexindev.net'; //用户系统
const API_BASE_PUR = 'http://pur.liexindev.net'; //采购系统
const API_BASE = 'http://wms.liexindev.net'; //WMS系统
const API_BASE_OSS = 'http://image.liexindev.net'; //oss系统
const API_BASE_USER = 'https://user.ichunt.net'; //用户系统
const API_BASE_PUR = 'https://purchase.ichunt.net'; //采购系统
const API_BASE = 'https://wms.ichunt.net'; //WMS系统
const API_BASE_OSS = 'https://image.ichunt.net'; //oss系统
// const API_BASE_USER = 'https://user.ichunt.net'; //用户系统
// const API_BASE_PUR = 'https://purchase.ichunt.net'; //采购系统
// const API_BASE = 'https://wms.ichunt.net'; //WMS系统
// const API_BASE_OSS = 'https://image.ichunt.net'; //oss系统
const API = {
......
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