Skip to content

梁建民 / wmsApp

Go to a project
Commit a2d83000 by LJM
Options

css

parent ee3dbc54
Inline Side-by-side
Showing with 69 additions and 13 deletions
assets/css/font.css
...@@ -11,6 +11,10 @@ ...@@ -11,6 +11,10 @@
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
.icon-zimu-M:before {
content: "\e660";
}
.icon-a-juxing3:before { .icon-a-juxing3:before {
content: "\e793"; content: "\e793";
} }
......
assets/css/tallyReceive/index.scss
...@@ -45,6 +45,11 @@ ...@@ -45,6 +45,11 @@
font-size: 30rpx; font-size: 30rpx;
color: #c6c7cc; color: #c6c7cc;
} }
.icon-zimu-M {
font-size: 30rpx;
color: #c6c7cc;
margin-left: 15rpx;
}
} }
.text { .text {
padding-left: 30rpx; padding-left: 30rpx;
......
assets/css/tallyReceive/operate.scss
...@@ -43,6 +43,11 @@ ...@@ -43,6 +43,11 @@
font-size: 30rpx; font-size: 30rpx;
color: #c6c7cc; color: #c6c7cc;
} }
.icon-zimu-M {
font-size: 30rpx;
color: #c6c7cc;
margin-left: 15rpx;
}
} }
.text { .text {
padding-left: 30rpx; padding-left: 30rpx;
......
pages/arrivalRegister/index.vue
...@@ -18,6 +18,9 @@ ...@@ -18,6 +18,9 @@
<template v-else-if="index == 1"> <template v-else-if="index == 1">
<input class="uni-input" placeholder="请输入入仓号" placeholder-style="color:#919399" focus v-model="searchParams.stock_in_with_stock_in_items_inhouse" @input="handleInput(2, $event)" maxlength="7" /> <input class="uni-input" placeholder="请输入入仓号" placeholder-style="color:#919399" focus v-model="searchParams.stock_in_with_stock_in_items_inhouse" @input="handleInput(2, $event)" maxlength="7" />
</template> </template>
<template v-else-if="index == 2">
<input class="uni-input" placeholder="请输入FedEx" placeholder-style="color:#919399" focus v-model="searchParams.tracking_no" @input="handleInput(3, $event)" style="width: 400rpx;" />
</template>
</view> </view>
<text class="iconfont icon-a-juxing11" @click="clearInput()" v-if="input_flag"></text> <text class="iconfont icon-a-juxing11" @click="clearInput()" v-if="input_flag"></text>
</view> </view>
...@@ -189,7 +192,7 @@ export default { ...@@ -189,7 +192,7 @@ export default {
page: 1, page: 1,
limit: 50, limit: 50,
index: 0, index: 0,
array: ['全量搜索', '入仓号'], array: ['全量搜索', '入仓号', 'FedEx'],
list: [], list: [],
filter_list: [], //筛选已选中的列表 filter_list: [], //筛选已选中的列表
filter_id: [], //过滤处理的id filter_id: [], //过滤处理的id
...@@ -199,7 +202,8 @@ export default { ...@@ -199,7 +202,8 @@ export default {
hasMoreData: true, //是否分页加载 hasMoreData: true, //是否分页加载
searchParams: { searchParams: {
mobile_register_all_search: '', //全量搜索 mobile_register_all_search: '', //全量搜索
stock_in_with_stock_in_items_inhouse: '' //入仓单号 stock_in_with_stock_in_items_inhouse: '', //入仓单号
tracking_no: '' //fedex
}, },
formParams: { formParams: {
warehouse_id: '', warehouse_id: '',
...@@ -299,6 +303,8 @@ export default { ...@@ -299,6 +303,8 @@ export default {
this.searchParams.mobile_register_all_search = ''; this.searchParams.mobile_register_all_search = '';
} else if (this.index == 1) { } else if (this.index == 1) {
this.searchParams.stock_in_with_stock_in_items_inhouse = ''; this.searchParams.stock_in_with_stock_in_items_inhouse = '';
} else if (this.index == 2) {
this.searchParams.tracking_no = '';
} }
this.getData(); this.getData();
}, },
...@@ -316,18 +322,21 @@ export default { ...@@ -316,18 +322,21 @@ export default {
this.searchParams.mobile_register_all_search = val; this.searchParams.mobile_register_all_search = val;
} else if (type == 2) { } else if (type == 2) {
this.searchParams.stock_in_with_stock_in_items_inhouse = val; this.searchParams.stock_in_with_stock_in_items_inhouse = val;
} else if (type == 3) {
var last12 = val.slice(22); // 截取后12位
this.searchParams.tracking_no = last12;
} }
this.input_flag = true; this.input_flag = true;
} else { } else {
this.input_flag = false; this.input_flag = false;
} }
this.getData(); this.getData();
}, 500), }, 800),
/** /**
* 获取列表数据 * 获取列表数据
*/ */
getData() { getData() {
this.request(API.stockInMobileRegisterList, 'POST', { page: this.page, limit: this.limit, is_register: 0, ...this.searchParams }, true).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) {
if (res.data.total > 0) { if (res.data.total > 0) {
this.hasMoreData = true; this.hasMoreData = true;
......
pages/tallyReceive/index.vue
...@@ -18,6 +18,9 @@ ...@@ -18,6 +18,9 @@
<template v-else-if="index == 1"> <template v-else-if="index == 1">
<input class="uni-input" placeholder="请输入入仓号" placeholder-style="color:#919399" focus v-model="searchParams.stock_in_with_stock_in_items_inhouse" @input="handleInput(2, $event)" maxlength="7" /> <input class="uni-input" placeholder="请输入入仓号" placeholder-style="color:#919399" focus v-model="searchParams.stock_in_with_stock_in_items_inhouse" @input="handleInput(2, $event)" maxlength="7" />
</template> </template>
<template v-else-if="index == 2">
<input class="uni-input" placeholder="请输入FedEx" placeholder-style="color:#919399" focus v-model="searchParams.tracking_no" @input="handleInput(0, $event)" style="width: 400rpx;" />
</template>
</view> </view>
<text class="iconfont icon-a-juxing11" @click="clearInput(1)" v-if="input_flag"></text> <text class="iconfont icon-a-juxing11" @click="clearInput(1)" v-if="input_flag"></text>
</view> </view>
...@@ -32,6 +35,7 @@ ...@@ -32,6 +35,7 @@
</view> </view>
<view> <view>
<text class="iconfont icon-juxing3" @click="createTallyContainer()"></text> <text class="iconfont icon-juxing3" @click="createTallyContainer()"></text>
<text class="iconfont icon-zimu-M" @click="createTallyContainer(1)"></text>
<text class="iconfont icon-a-juxing11" @click="clearInput(2)" v-if="input_contaion"></text> <text class="iconfont icon-a-juxing11" @click="clearInput(2)" v-if="input_contaion"></text>
</view> </view>
</view> </view>
...@@ -183,7 +187,7 @@ export default { ...@@ -183,7 +187,7 @@ export default {
limit: 50, limit: 50,
index: 0, index: 0,
indexContainer: -1, indexContainer: -1,
array: ['全量搜索', '入仓号'], array: ['全量搜索', '入仓号', 'FedEx'],
list: [], list: [],
filter_list: [], //筛选已选中的列表 filter_list: [], //筛选已选中的列表
filter_id: [], //入库单列表的入库登记 filter_id: [], //入库单列表的入库登记
...@@ -195,7 +199,8 @@ export default { ...@@ -195,7 +199,8 @@ export default {
mobile_wait_tally_all_search: '', //全量搜索 mobile_wait_tally_all_search: '', //全量搜索
stock_in_with_stock_in_items_inhouse: '', //入仓单号 stock_in_with_stock_in_items_inhouse: '', //入仓单号
container_name: '', //容器编码 container_name: '', //容器编码
container_id: '' //容器id container_id: '', //容器id,
tracking_no: '' //fedex
}, },
formParams: { formParams: {
container_id: '', container_id: '',
...@@ -292,6 +297,8 @@ export default { ...@@ -292,6 +297,8 @@ export default {
this.searchParams.mobile_wait_tally_all_search = ''; this.searchParams.mobile_wait_tally_all_search = '';
} else if (this.index == 1) { } else if (this.index == 1) {
this.searchParams.stock_in_with_stock_in_items_inhouse = ''; this.searchParams.stock_in_with_stock_in_items_inhouse = '';
} else if (this.index == 2) {
this.searchParams.tracking_no = '';
} }
} else { } else {
this.input_contaion = false; this.input_contaion = false;
...@@ -303,8 +310,15 @@ export default { ...@@ -303,8 +310,15 @@ export default {
/** /**
*刷新容器 *刷新容器
*/ */
createTallyContainer() { createTallyContainer(type) {
this.request(API.createTallyContainer, 'GET', {}, false).then(res => { if (type == 1) {
var params = {
is_mac: 1
};
} else {
var params = {};
}
this.request(API.createTallyContainer, 'GET', params, true).then(res => {
if (res.code === 0) { if (res.code === 0) {
this.searchParams.container_name = res.data.container_sn; this.searchParams.container_name = res.data.container_sn;
this.searchParams.container_id = res.data.id; this.searchParams.container_id = res.data.id;
...@@ -329,6 +343,7 @@ export default { ...@@ -329,6 +343,7 @@ export default {
this.resetChange(); this.resetChange();
this.searchParams.mobile_wait_tally_all_search = ''; this.searchParams.mobile_wait_tally_all_search = '';
this.searchParams.stock_in_with_stock_in_items_inhouse = ''; this.searchParams.stock_in_with_stock_in_items_inhouse = '';
this.searchParams.tracking_no = '';
this.searchParams.mobile_wait_tally_all_search = val; this.searchParams.mobile_wait_tally_all_search = val;
this.input_flag = true; this.input_flag = true;
...@@ -337,10 +352,21 @@ export default { ...@@ -337,10 +352,21 @@ export default {
this.resetChange(); this.resetChange();
this.searchParams.mobile_wait_tally_all_search = ''; this.searchParams.mobile_wait_tally_all_search = '';
this.searchParams.stock_in_with_stock_in_items_inhouse = ''; this.searchParams.stock_in_with_stock_in_items_inhouse = '';
this.searchParams.tracking_no = '';
this.searchParams.stock_in_with_stock_in_items_inhouse = val; this.searchParams.stock_in_with_stock_in_items_inhouse = val;
this.input_flag = true; this.input_flag = true;
this.getData(); this.getData();
} else if (type == 0) {
this.resetChange();
this.searchParams.mobile_wait_tally_all_search = '';
this.searchParams.stock_in_with_stock_in_items_inhouse = '';
this.searchParams.tracking_no = '';
var last12 = val.slice(22); // 截取后12位
this.searchParams.tracking_no = last12;
this.input_flag = true;
this.getData();
} else if (type == 3) { } else if (type == 3) {
this.searchParams.container_name = val; this.searchParams.container_name = val;
this.input_contaion = true; this.input_contaion = true;
...@@ -355,7 +381,7 @@ export default { ...@@ -355,7 +381,7 @@ export default {
this.input_contaion = false; this.input_contaion = false;
} }
} }
}, 500), }, 800),
bindPickerChange: function(e) { bindPickerChange: function(e) {
console.log('picker发送选择改变，携带值为', e.detail.value); console.log('picker发送选择改变，携带值为', e.detail.value);
this.index = e.detail.value; this.index = e.detail.value;
...@@ -364,7 +390,7 @@ export default { ...@@ -364,7 +390,7 @@ export default {
* 获取列表数据 * 获取列表数据
*/ */
getData() { getData() {
this.request(API.waitTallyReceiveList, 'POST', { page: this.page, limit: this.limit, ...this.searchParams }, true).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) {
if (res.data.total > 0) { if (res.data.total > 0) {
this.hasMoreData = true; this.hasMoreData = true;
......
pages/tallyReceive/operate.vue
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
</view> </view>
<view> <view>
<text class="iconfont icon-juxing3" @click="createTallyContainer()"></text> <text class="iconfont icon-juxing3" @click="createTallyContainer()"></text>
<text class="iconfont icon-zimu-M" @click="createTallyContainer(1)"></text>
<text class="iconfont icon-a-juxing11" @click="clearInput(2)" v-if="input_contaion"></text> <text class="iconfont icon-a-juxing11" @click="clearInput(2)" v-if="input_contaion"></text>
</view> </view>
</view> </view>
...@@ -323,8 +324,15 @@ export default { ...@@ -323,8 +324,15 @@ export default {
/** /**
*刷新容器 *刷新容器
*/ */
createTallyContainer() { createTallyContainer(type) {
this.request(API.createTallyContainer, 'GET', {}, false).then(res => { if (type == 1) {
var params = {
is_mac: 1
};
} else {
var params = {};
}
this.request(API.createTallyContainer, 'GET', params, false).then(res => {
if (res.code === 0) { if (res.code === 0) {
this.is_submit = true; this.is_submit = true;
this.searchParams.container_name = res.data.container_sn; this.searchParams.container_name = res.data.container_sn;
......
static/iconfont.ttf
No preview for this file type
util/util.js
import API_BASE from '../util/api.js'
/** /**
* 请求封装 * 请求封装
*/ */
......
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