Skip to content

梁建民 / wmsApp

Go to a project
Commit 900dbde3 by LJM
Options

css

parent a3fbc118
Inline Side-by-side
Showing with 283 additions and 114 deletions
assets/css/stockRecheck/sort.scss
......@@ -514,11 +514,17 @@
}
.box-row {
margin-bottom: 10rpx;
.text {
flex: 0 0 20%;
text {
color: #484b59;
font-size: 22rpx;
}
.text {
flex: 0 0 20%;
text {
color: #484b59;
font-size: 22rpx;
}
}
}
.box-wrap {
padding: 18rpx;
......
assets/css/tallyReceive/operate.scss
......@@ -177,6 +177,29 @@
font-size: 16rpx;
}
}
.pick-box {
position: relative;
.uni-input {
width: 278rpx;
height: 43rpx;
line-height: 43rpx;
background: #ffffff;
border-radius: 10rpx;
border: 1px solid #1969f9;
text-indent: 15rpx;
font-size: 16rpx;
}
.uni-arrow {
position: absolute;
right: 13rpx;
top: 18rpx;
width: 14rpx;
height: 9rpx;
background: url('https://img.ichunt.com/images/ichunt/202304/10/e4c72319ad41ce1425f71cc6ec35f111.png') no-repeat center;
background-size: contain;
margin-left: 12rpx;
}
}
}
}
.item-tit {
......
pages/arrivalRegister/index.vue
......@@ -69,8 +69,12 @@
<text class="text">查不到当前数据</text>
</view>
<view class="fix-btn row verCenter">
<view class="btn3 row rowCenter verCenter" @click="allChnage()">
<text class="check-box-icon" :class="{ curr: filter_list.length > 0 && filter_list.length == filter_id.length }"></text>
<text class="text">全选</text>
</view>
<view class="btn1 row rowCenter verCenter" @click="showDrawers()">无单号登记</view>
<view class="btn2 row rowCenter verCenter" @click="addStockInRegister(1)">到货登记</view>
<view class="btn2 row rowCenter verCenter" @click="addStockInRegister(1)" style="width: calc(100% - 376rpx);">到货登记</view>
</view>
<!-- 入库单详情弹窗 -->
<uni-drawer ref="showRight" mode="right">
......@@ -217,6 +221,20 @@ export default {
this.filter_id = filter_arr.map(i => this.list[i].stock_in_id);
},
/**
* 全选
*/
allChnage() {
this.all_flag = !this.all_flag;
this.filter_list = createArray(this.list.length, this.all_flag);
if (this.all_flag) {
this.filter_id = this.list.map(function(item) {
return item.stock_in_id;
});
} else {
this.filter_id = [];
}
},
/**
* 清空数据
*/
clearInput() {
......
pages/picking/me.vue
......@@ -62,7 +62,7 @@
<!--出库单状态为全部拣货-->
<template v-if="item.stock_out_status == 5">
<navigator url="/pages/picking/record" hover-class="none" class="btn2 row rowCenter verCenter">详情</navigator>
<navigator :url="'/pages/picking/record?stock_out_sn=' + item.stock_out_sn" hover-class="none" class="btn2 row rowCenter verCenter">详情</navigator>
</template>
</view>
</view>
......
pages/picking/record.vue
......@@ -101,6 +101,9 @@ export default {
}
};
},
onLoad(options) {
this.searchParams.stock_out_sn = options.stock_out_sn;
},
onShow() {
this.getData();
},
......
pages/picking/sort.vue
......@@ -85,7 +85,7 @@
</view>
<view class="input-box row verCenter">
<text class="label">应拣数量：</text>
<text class="text" style="color: #F98119;">{{item.pick_qty}}</text>
<text class="text" style="color: #F98119;">{{item.lock_qty - item.pick_qty}}</text>
</view>
<view class="input-box row verCenter">
<text class="label">销 售 员：</text>
......@@ -188,7 +188,7 @@
<view class="field-item row">
<view class="item row verCenter">
<text class="label">应拣数量：</text>
<text class="tt">{{detail.pick_qty}}</text>
<text class="text">{{detail.lock_qty - detail.pick_qty}}</text>
</view>
<view class="item row verCenter">
<text class="label">单 位：</text>
......@@ -341,7 +341,7 @@ export default {
onNavigationBarButtonTap(e) {
if (e.index == 0) {
uni.navigateTo({
url: '/pages/picking/record'
url: '/pages/picking/record?stock_out_sn='+this.stock_out_sn
});
}
},
......@@ -361,6 +361,7 @@ export default {
if (type == 1) {
this.$refs.showRight.open();
this.detail=data;
this.formParams.pick_qty=Number(data.lock_qty) - Number(data.pick_qty)
} else if (type == 2) {
this.$refs.showRightPack.open();
this.detailContainer=data;
......
pages/stockRecheck/print.vue
......@@ -169,25 +169,60 @@
<view class="field-item row">
<view class="item row verCenter" style="flex: 0 0 100%;">
<text class="label">收货公司：</text>
<text class="tt">{{ detail.stock_out_info.customer_name }}</text>
<text class="tt" style="max-width: 100%;">{{ detail.stock_out_info.customer_name }}</text>
</view>
<view class="item row verCenter">
<text class="label">收 货 人：</text>
<text class="tt">{{ detail.stock_out_address.consignee }}</text>
</view>
<view class="row bothSide verCenter">
<view class="form-input" style="width: 48%;">
<view class="input-title">
<text class="input-title-t1">*</text>
<text class="input-title-t2">收货联系人：</text>
</view>
<view class="input-box"><input type="text" class="uni-input" placeholder-style="color:#919399" placeholder="请输入" v-model="formParams.consignee" /></view>
</view>
<view class="item row verCenter">
<text class="label">联系电话：</text>
<text class="tt">{{ detail.stock_out_address.mobile }}</text>
<view class="form-input" style="width: 48%;">
<view class="input-title">
<text class="input-title-t1">*</text>
<text class="input-title-t2">联系电话：</text>
</view>
<view class="input-box"><input type="text" class="uni-input" placeholder-style="color:#919399" placeholder="请输入" v-model="formParams.mobile" /></view>
</view>
<view class="item row verCenter" style="flex: 0 0 100%;">
<text class="label">收货地址：</text>
<text class="tt" style="max-width: 100%;">{{ detail.stock_out_address.province }}{{ detail.stock_out_address.city }}{{ detail.stock_out_address.district }}{{ detail.stock_out_address.address }}</text>
</view>
<view class="row bothSide verCenter">
<view class="form-input" style="width: 48%;">
<view class="input-title">
<text class="input-title-t1">*</text>
<text class="input-title-t2">省：</text>
</view>
<view class="input-box"><input type="text" class="uni-input" placeholder-style="color:#919399" placeholder="请输入" v-model="formParams.province" /></view>
</view>
<view class="form-input" style="width: 48%;">
<view class="input-title">
<text class="input-title-t1">*</text>
<text class="input-title-t2">市：</text>
</view>
<view class="input-box"><input type="text" class="uni-input" placeholder-style="color:#919399" placeholder="请输入" v-model="formParams.city" /></view>
</view>
</view>
<view class="row bothSide verCenter">
<view class="form-input" style="width: 48%;">
<view class="input-title">
<text class="input-title-t1">*</text>
<text class="input-title-t2">区：</text>
</view>
<view class="input-box"><input type="text" class="uni-input" placeholder-style="color:#919399" placeholder="请输入" v-model="formParams.district" /></view>
</view>
<view class="form-input" style="width: 48%;">
<view class="input-title">
<text class="input-title-t1">*</text>
<text class="input-title-t2">地址：</text>
</view>
<view class="input-box"><input type="text" class="uni-input" placeholder-style="color:#919399" placeholder="请输入" v-model="formParams.address" /></view>
</view>
</view>
<view class="btn row verCenter bothSide">
<template v-if="formParams.real_shipping_type == 1 && formParams.real_shipping_id == 1">
<view class="btn2 row rowCenter verCenter" style="width: 50%;" @click="updateDeliveryInfo(detail.stock_out_info.stock_out_id)">保存</view>
<view class="btn1 row rowCenter verCenter" style="width: 50%;" @click="printExpress(detail.stock_out_info.stock_out_id)">打 印</view>
<view class="btn1 row rowCenter verCenter" style="width: 100%;" @click="updateDeliveryInfo(detail.stock_out_info.stock_out_id)">保存</view>
</template>
<template v-else>
<view class="btn2 row rowCenter verCenter" style="width: 100%;" @click="updateDeliveryInfo(detail.stock_out_info.stock_out_id)">保存</view>
......@@ -226,7 +261,13 @@ export default {
real_shipping_id: '', //物流公司
real_shipping_mode: '', //物流模式
shipping_code: '', //物流单号
is_receipt: '' //是否签回单
is_receipt: '', //是否签回单
consignee: '',
mobile: '',
province: '',
city: '',
district: '',
address: ''
}
};
},
......@@ -347,6 +388,12 @@ export default {
this.formParams.real_shipping_type = 1; //设置默认
this.formParams.real_shipping_id = 1;
this.formParams.shipping_code = res.data.stock_out_address.shipping_code;
this.formParams.consignee = res.data.stock_out_address.consignee;
this.formParams.mobile = res.data.stock_out_address.mobile;
this.formParams.province = res.data.stock_out_address.province;
this.formParams.city = res.data.stock_out_address.city;
this.formParams.district = res.data.stock_out_address.district;
this.formParams.address = res.data.stock_out_address.address;
this.realShippChage(1);
} else {
uni.showToast({
......@@ -369,7 +416,13 @@ export default {
real_shipping_id: this.formParams.real_shipping_id,
real_shipping_mode: this.formParams.real_shipping_mode,
shipping_code: this.formParams.shipping_code,
is_receipt: 1
is_receipt: 1,
consignee: this.formParams.consignee,
mobile: this.formParams.mobile,
province: this.formParams.province,
city: this.formParams.city,
district: this.formParams.district,
address: this.formParams.address
},
true
).then(res => {
......@@ -378,6 +431,9 @@ export default {
title: '保存成功',
icon: 'success'
});
setTimeout(() => {
this.closeDrawer();
}, 2000);
} else {
uni.showModal({
itle: '提示',
......
pages/stockRecheck/sort.vue
......@@ -404,11 +404,11 @@
</view>
<view class="row avarage verCenter box-row">
<template v-if="company_id == 1">
<text>长cm</text>
<text>宽cm</text>
<text>高cm</text>
<text>净重kg</text>
<text>毛量kg</text>
<text style="flex: 0 0 20%;">长cm</text>
<text style="flex: 0 0 20%;">宽cm</text>
<text style="flex: 0 0 20%;">高cm</text>
<text style="flex: 0 0 20%;">净重kg</text>
<text style="flex: 0 0 20%;">毛量kg</text>
</template>
<template v-else>
<view class="text">
......@@ -441,6 +441,10 @@
<input type="text" placeholder="毛量kg" placeholder-style="color:#919399" class="uni-input" v-model="packList[i].gross_weight" />
</view>
</view>
<view class="no-date column rowCenter verCenter" v-if="packList.length == 0">
<text class="iconfont icon-a-juxing21"></text>
<text class="text">暂无箱信息</text>
</view>
</view>
<view class="btn row verCenter bothSide">
<view class="btn0 row rowCenter verCenter" @click="closeBox()">取 消</view>
......@@ -727,83 +731,85 @@ export default {
* 保存打包信息
*/
updatePackInfo() {
var parmas = {
pack_list: JSON.stringify(this.packList)
};
if (this.company_id == 2) {
var hasEmptyWidth = this.packList.some(function(item) {
return item.width === '';
});
var hasEmptyLength = this.packList.some(function(item) {
return item.length === '';
});
var hasEmptyHight = this.packList.some(function(item) {
return item.hight === '';
});
var hasEmptynetWeight = this.packList.some(function(item) {
return item.net_weight === '';
});
var hasEmptygrossWeight = this.packList.some(function(item) {
return item.gross_weight === '';
});
if (hasEmptyLength) {
uni.showModal({
itle: '提示',
content: '请输入宽',
showCancel: false
if (this.packList.length > 0) {
var parmas = {
pack_list: JSON.stringify(this.packList)
};
if (this.company_id == 2) {
var hasEmptyWidth = this.packList.some(function(item) {
return item.width === '';
});
return false;
}
if (hasEmptyWidth) {
uni.showModal({
itle: '提示',
content: '请输入长',
showCancel: false
var hasEmptyLength = this.packList.some(function(item) {
return item.length === '';
});
return false;
}
if (hasEmptyHight) {
uni.showModal({
itle: '提示',
content: '请输入高',
showCancel: false
var hasEmptyHight = this.packList.some(function(item) {
return item.hight === '';
});
return false;
}
if (hasEmptynetWeight) {
uni.showModal({
itle: '提示',
content: '请输入净重',
showCancel: false
var hasEmptynetWeight = this.packList.some(function(item) {
return item.net_weight === '';
});
return false;
}
if (hasEmptygrossWeight) {
uni.showModal({
itle: '提示',
content: '请输入毛重',
showCancel: false
var hasEmptygrossWeight = this.packList.some(function(item) {
return item.gross_weight === '';
});
return false;
if (hasEmptyLength) {
uni.showModal({
itle: '提示',
content: '请输入宽',
showCancel: false
});
return false;
}
if (hasEmptyWidth) {
uni.showModal({
itle: '提示',
content: '请输入长',
showCancel: false
});
return false;
}
if (hasEmptyHight) {
uni.showModal({
itle: '提示',
content: '请输入高',
showCancel: false
});
return false;
}
if (hasEmptynetWeight) {
uni.showModal({
itle: '提示',
content: '请输入净重',
showCancel: false
});
return false;
}
if (hasEmptygrossWeight) {
uni.showModal({
itle: '提示',
content: '请输入毛重',
showCancel: false
});
return false;
}
}
this.request(API.updatePackInfo, 'POST', parmas, true).then(res => {
if (res.code === 0) {
uni.showToast({
title: '保存成功',
icon: 'success'
});
setTimeout(() => {
this.closeBox();
}, 2000);
} else {
uni.showModal({
itle: '提示',
content: res.msg,
showCancel: false
});
}
});
}
this.request(API.updatePackInfo, 'POST', parmas, true).then(res => {
if (res.code === 0) {
uni.showToast({
title: '保存成功',
icon: 'success'
});
setTimeout(() => {
this.closeBox();
}, 2000);
} else {
uni.showModal({
itle: '提示',
content: res.msg,
showCancel: false
});
}
});
},
/**
* 展示箱信息
......
pages/tallyReceive/index.vue
......@@ -206,6 +206,7 @@ export default {
onShow() {
if (this.noexebshowFalg) {
this.getData();
this.getTallyContainerDefault();
}
},
methods: {
......@@ -359,6 +360,29 @@ export default {
}
});
},
getTallyContainerDefault() {
this.request(API.getTallyContainer, 'GET', {}, false).then(res => {
if (res.code === 0) {
let checked_id = res.data.checked_id;
let list = res.data.list;
let filter_arr = list.filter(function(item) {
if (item.id == checked_id) {
return item;
}
});
if (filter_arr.length > 0) {
this.searchParams.container_name = filter_arr[0].name;
this.searchParams.container_id = filter_arr[0].id;
this.formParams.container_id = filter_arr[0].id;
}
} else {
uni.showToast({
title: res.msg,
icon: 'error'
});
}
});
},
/**
* 获取容器列表数据
*/
......
pages/tallyReceive/operate.vue
......@@ -82,10 +82,6 @@
<text class="tt">{{ detail.quality_cn }}</text>
</view>
<view class="item row verCenter">
<text class="label">是否质检：</text>
<text class="text">{{ detail.is_qc_cn }}</text>
</view>
<view class="item row verCenter">
<text class="label">预期数量：</text>
<text class="tt">{{ detail.expect_qty }}</text>
</view>
......@@ -93,6 +89,14 @@
<text class="label">单 位：</text>
<text class="tt">{{ detail.goods_unit }}</text>
</view>
<view class="item row verCenter">
<text class="label">待理货数量：</text>
<text class="tt" style="color: #f98119;font-weight: bold;">{{ detail.wait_tally_qty }}</text>
</view>
<view class="item row verCenter" style="flex: 0 0 100%;">
<text class="label">是否质检：</text>
<text class="text" style="font-weight: bold;">{{ detail.is_qc_cn }}</text>
</view>
</view>
<view class="form-input">
<view class="row bothSide verCenter input-box-wrap">
......@@ -103,9 +107,9 @@
</view>
<view class="input-box"><input type="number" class="uni-input" placeholder-style="color:#919399" placeholder="请输入理货数量" v-model="formParams.tally_qty" @input="handleInputNumber($event, detail.wait_tally_qty)" /></view>
</view>
<view class="row verCenter" style="flex: 0 0 278rpx;margin-top: 38rpx;">
<text class="input-title-p1">待理货数量：</text>
<text class="input-title-p2">{{ detail.wait_tally_qty }}</text>
<view>
<view class="input-title"><text class="input-title-t2">其它批次属性：</text></view>
<view class="input-box"><input type="text" class="uni-input" placeholder-style="color:#919399" placeholder="请输入" v-model="formParams.other_batch_attr" /></view>
</view>
</view>
<view class="row bothSide verCenter input-box-wrap">
......@@ -115,15 +119,15 @@
</view>
<view>
<view class="input-title"><text class="input-title-t2">产 地：</text></view>
<view class="input-box"><input type="text" class="uni-input" placeholder-style="color:#919399" placeholder="请输入产 地" v-model="formParams.coo" /></view>
</view>
</view>
<view class="row bothSide verCenter input-box-wrap">
<view>
<view class="input-title"><text class="input-title-t2">其它批次属性：</text></view>
<view class="input-box"><input type="text" class="uni-input" placeholder-style="color:#919399" placeholder="请输入" v-model="formParams.other_batch_attr" /></view>
<view class="pick-box">
<picker @change="bindPickerChange($event, 1)" :value="useOptionIndex" :range="useOption" :range-key="'country_cn'">
<view class="row verCenter">
<view class="uni-input">{{ useOptionIndex == -1 ? '请选择' : useOption[index].country_cn }}</view>
<view class="uni-arrow"></view>
</view>
</picker>
</view>
</view>
<view></view>
</view>
</view>
<view class="h2 row bothSide verCenter" style="margin-top: 34rpx;">
......@@ -187,6 +191,8 @@ export default {
detail: {}, //详情的数据
image_list: [], //图片列表
maxNum: 10, //最大上传图片数量
useOptionIndex: -1,
useOption: [], //产地
searchParams: {
stock_in_sn: '', //入库单号
tracking_no: '', //物流单号
......@@ -215,6 +221,7 @@ export default {
onShow() {
if (this.noexebshowFalg) {
this.getData();
this.getUseOption();
}
},
watch: {
......@@ -227,9 +234,13 @@ export default {
}
},
methods: {
bindPickerChange: function(e) {
bindPickerChange: function(e, type) {
console.log('picker发送选择改变，携带值为', e.detail.value);
this.index = e.detail.value;
if (type == 1) {
this.useOptionIndex = e.detail.value;
} else {
this.index = e.detail.value;
}
},
/**
* 监听理货数量
......@@ -344,6 +355,23 @@ export default {
}
}, 500),
/**
* 获取产地
*/
getUseOption() {
this.request(API.getUseOption, 'GET', { type: 'coo' }, false).then(res => {
if (res.code === 0) {
if (res.data.length > 0) {
this.useOption = res.data;
}
} else {
uni.showToast({
title: res.msg,
icon: 'error'
});
}
});
},
/**
* 获取详情数据
*/
getData() {
......
util/api.js
......@@ -242,7 +242,11 @@ const API = {
/**
* 保存打包信息
* */
updatePackInfo: API_BASE + '/api/stockRecheck/updatePackInfo'
updatePackInfo: API_BASE + '/api/stockRecheck/updatePackInfo',
/**
* 获取产地
* */
getUseOption: API_BASE + '/api/stockIn/getUseOption'
}
......
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