Skip to content

梁建民 / wmsMin

Go to a project
Commit b8d6168a by liangjianmin
Options

js

parent 9a8e4513
Inline Side-by-side
Showing with 58 additions and 53 deletions
assets/css/goods/addReceiving.scss
...@@ -2,12 +2,13 @@ ...@@ -2,12 +2,13 @@
margin-top: 24rpx; margin-top: 24rpx;
padding: 0 24rpx; padding: 0 24rpx;
.base-information { .base-information {
padding: 24rpx; padding: 0 24rpx;
background: #ffffff; background: #ffffff;
border-radius: 4rpx; border-radius: 4rpx;
margin-bottom: 16rpx; margin-bottom: 16rpx;
.top { .top {
margin-bottom: 24rpx; padding: 23rpx 0;
border-bottom: 1px solid #e6edf0;
.title { .title {
.arrow { .arrow {
width: 12rpx; width: 12rpx;
...@@ -33,25 +34,22 @@ ...@@ -33,25 +34,22 @@
font-size: 24rpx; font-size: 24rpx;
color: #404547; color: #404547;
} }
.rotate{ .rotate {
transform: rotate(0deg); transform: rotate(0deg);
} }
} }
} }
.pp { .pp {
margin-bottom: 20rpx; height: 80rpx;
&.mb0 {
margin-bottom: 0;
}
.t1 { .t1 {
width: 120rpx; width: 156rpx;
font-size: 24rpx; font-size: 24rpx;
color: #6e767a; color: #6e767a;
margin-right: 16rpx;
} }
.t2 { .input-wrap {
font-size: 24rpx; .uni-input {
color: #404547; font-size: 24rpx;
}
} }
} }
} }
...@@ -85,10 +83,10 @@ ...@@ -85,10 +83,10 @@
color: #6e767a; color: #6e767a;
margin-right: 60rpx; margin-right: 60rpx;
} }
.input-wrap{ .input-wrap {
width: calc(100% - 160rpx); width: calc(100% - 160rpx);
.tab-panel{ .tab-panel {
&:last-child{ &:last-child {
margin-right: 0; margin-right: 0;
} }
} }
......
assets/css/goods/tallyDetail.scss
...@@ -103,11 +103,15 @@ ...@@ -103,11 +103,15 @@
.t1 { .t1 {
font-size: 22rpx; font-size: 22rpx;
color: #6e767a; color: #6e767a;
white-space: nowrap;
} }
.t2 { .t2 {
font-size: 22rpx; font-size: 22rpx;
color: #404547; color: #404547;
} }
.isClick {
color: #197adb;
}
} }
.input-box { .input-box {
.t1 { .t1 {
......
pages/goods/addReceiving.vue
...@@ -6,34 +6,10 @@ ...@@ -6,34 +6,10 @@
<text class="arrow row rowCenter verCenter"></text> <text class="arrow row rowCenter verCenter"></text>
<text class="tt">基础信息</text> <text class="tt">基础信息</text>
</view> </view>
<view class="toggle row verCenter" @click="toggle()">
<text class="iconfont icon-sanjiaoxing" :class="{ rotate: flag }"></text>
<text class="tt">{{ flag ? '隐藏' : '展开' }}</text>
</view>
</view> </view>
<view class="pp row verCenter"> <view class="pp row verCenter">
<text class="t1">入仓号：</text> <text class="t1">入仓号</text>
<text class="t2">{{ form.checkIn.number }}</text> <view class="input-wrap"><input type="text" v-model="form.erp_order_sn" class="uni-input" placeholder="请输入入仓号(必填)" placeholder-style="color:#404547;font-weight:bold;" /></view>
</view>
<view class="pp row verCenter" v-if="flag">
<text class="t1">订单时间：</text>
<text class="t2">{{ form.checkIn.orderDate }}</text>
</view>
<view class="pp row verCenter" v-if="flag">
<text class="t1">订单客户：</text>
<text class="t2">{{ form.checkIn.customer }}</text>
</view>
<view class="pp row verCenter" v-if="flag">
<text class="t1">供应商：</text>
<text class="t2">{{ form.checkIn.supplier }}</text>
</view>
<view class="pp row verCenter">
<text class="t1">送货方式：</text>
<text class="t2">{{ form.checkIn.delivery }}</text>
</view>
<view class="pp row verCenter mb0">
<text class="t1">采购备注：</text>
<text class="t2">{{ form.checkIn.remark || '--' }}</text>
</view> </view>
</view> </view>
<view class="receiving-information"> <view class="receiving-information">
...@@ -127,7 +103,8 @@ export default { ...@@ -127,7 +103,8 @@ export default {
unit: '件', //单位 unit: '件', //单位
check_in_pic: [], //收货图片 check_in_pic: [], //收货图片
check_in_remark: '', //收货备注 check_in_remark: '', //收货备注
checkIn: '' checkIn: '',
erp_order_sn: '' //入仓号
} }
}; };
}, },
...@@ -259,10 +236,19 @@ export default { ...@@ -259,10 +236,19 @@ export default {
this.form.logistics_company = this.array[e.target.value]; this.form.logistics_company = this.array[e.target.value];
}, },
submit() { submit() {
if (!this.form.erp_order_sn) {
uni.showModal({
title: '提示',
content: '请输入入仓号',
showCancel: false
});
return false;
}
if (!this.form.total_num) { if (!this.form.total_num) {
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
content: '输入登记数量', content: '请输入登记数量',
showCancel: false showCancel: false
}); });
return false; return false;
......
pages/goods/tallyDetail.vue
...@@ -48,18 +48,21 @@ ...@@ -48,18 +48,21 @@
<view class="box" v-for="(item, index) in goodsArrangeData.entrys" :key="index"> <view class="box" v-for="(item, index) in goodsArrangeData.entrys" :key="index">
<view class="pp row verCenter"> <view class="pp row verCenter">
<view class="w row verCenter"> <view class="w row verCenter">
<text class="t1">规格型号：</text> <text class="t1" @click="verifyChange(index, 0, item.model)">规格型号：</text>
<text class="t2">{{ item.model }}</text> <text class="t2" @click="verifyChange(index, 0, item.model)">{{ item.model }}</text>
<text class="isClick" v-if="clickStatus[index][0]">✔</text>
</view> </view>
<view class="w row verCenter"> <view class="w row verCenter">
<text class="t1">品牌：</text> <text class="t1" @click="verifyChange(index, 1, item.brand)">品牌：</text>
<text class="t2">{{ item.brand }}</text> <text class="t2" @click="verifyChange(index, 1, item.brand)">{{ item.brand }}</text>
<text class="isClick" v-if="clickStatus[index][1]">✔</text>
</view> </view>
</view> </view>
<view class="pp row verCenter"> <view class="pp row verCenter">
<view class="w row verCenter"> <view class="w row verCenter">
<text class="t1">订单数量：</text> <text class="t1" @click="verifyChange(index, 2, item.qty)">订单数量：</text>
<text class="t2">{{ item.qty }}</text> <text class="t2" @click="verifyChange(index, 2, item.qty)">{{ item.qty }}</text>
<text class="isClick" v-if="clickStatus[index][2]">✔</text>
</view> </view>
<view class="w row verCenter"> <view class="w row verCenter">
<text class="t1">单位：</text> <text class="t1">单位：</text>
...@@ -68,8 +71,9 @@ ...@@ -68,8 +71,9 @@
</view> </view>
<view class="pp row verCenter"> <view class="pp row verCenter">
<view class="w row verCenter"> <view class="w row verCenter">
<text class="t1">原产国：</text> <text class="t1" @click="verifyChange(index, 3, item.country)">原产国：</text>
<text class="t2">{{ item.country || '--' }}</text> <text class="t2" @click="verifyChange(index, 3, item.country)">{{ item.country || '--' }}</text>
<text class="isClick" v-if="clickStatus[index][3]">✔</text>
</view> </view>
<view class="w row verCenter"> <view class="w row verCenter">
<text class="t1">货物名称：</text> <text class="t1">货物名称：</text>
...@@ -176,6 +180,7 @@ export default { ...@@ -176,6 +180,7 @@ export default {
picTextStatus: [], //照片文字说明 picTextStatus: [], //照片文字说明
print_text: '总箱数', print_text: '总箱数',
text: '总箱数', text: '总箱数',
clickStatus: [], //是否点击状态数组
disabled: false, //按钮重复点击 disabled: false, //按钮重复点击
printForm: { printForm: {
erp_order_sn_pre: '', //A单B单 erp_order_sn_pre: '', //A单B单
...@@ -235,8 +240,14 @@ export default { ...@@ -235,8 +240,14 @@ export default {
if (res.err_code === 0) { if (res.err_code === 0) {
this.goodsArrangeData = res.data[0]; this.goodsArrangeData = res.data[0];
this.form.entrys = res.data[0]; this.form.entrys = res.data[0];
this.form.baseinfo = []; //基础信息
this.picTextStatus = []; //照片文字说明
this.clickStatus = []; //是否点击状态
if (res.data[0].entrys.length > 0) { if (res.data[0].entrys.length > 0) {
for (let i = 0; i < res.data[0].entrys.length; i++) { for (let i = 0; i < res.data[0].entrys.length; i++) {
this.clickStatus.push([false, false, false, false]);
this.picTextStatus.push(false); this.picTextStatus.push(false);
this.form.baseinfo.push({ this.form.baseinfo.push({
weight: '', weight: '',
...@@ -288,6 +299,12 @@ export default { ...@@ -288,6 +299,12 @@ export default {
toggle() { toggle() {
this.flag = !this.flag; this.flag = !this.flag;
}, },
verifyChange(index, i, val) {
console.log(val);
if (val) {
this.$set(this.clickStatus[index], i, !this.clickStatus[index][i]);
}
},
inputChange() { inputChange() {
if (this.form.sort_goods_remark.length <= 200) { if (this.form.sort_goods_remark.length <= 200) {
this.limitword = this.form.sort_goods_remark.length; this.limitword = this.form.sort_goods_remark.length;
...@@ -367,7 +384,7 @@ export default { ...@@ -367,7 +384,7 @@ export default {
this.printForm.erp_order_sn_pre = this.form.number.substr(0, 1); this.printForm.erp_order_sn_pre = this.form.number.substr(0, 1);
this.printForm.erp_order_sn_number = this.form.number.slice(1, this.form.number.length); this.printForm.erp_order_sn_number = this.form.number.slice(1, this.form.number.length);
} }
//禁止按钮重复点击 //禁止按钮重复点击
if (this.disabled) { if (this.disabled) {
uni.showModal({ uni.showModal({
......
pages/home/index.vue
...@@ -155,7 +155,7 @@ export default { ...@@ -155,7 +155,7 @@ export default {
}); });
} else if (item.name == '收货登记') { } else if (item.name == '收货登记') {
uni.navigateTo({ uni.navigateTo({
url: '/pages/goods/receiving' url: '/pages/goods/addReceiving'
}); });
} else if (item.name == '理货作业') { } else if (item.name == '理货作业') {
uni.navigateTo({ uni.navigateTo({
......
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