Skip to content

梁建民 / wmsMin

Go to a project
Commit c3d82e72 by LJM
Options

add

parent ec0d7ff0
Inline Side-by-side
Showing with 130 additions and 132 deletions
assets/css/tally/abnormalTally.scss
......@@ -101,20 +101,20 @@
margin-bottom: 16rpx;
}
.t1 {
font-size: 22rpx;
font-size: 26rpx;
color: #404547;
font-weight: bold;
}
.t2 {
font-size: 22rpx;
font-size: 26rpx;
color: #6e767a;
}
.t3 {
font-size: 22rpx;
font-size: 26rpx;
color: #404547;
}
.t4 {
font-size: 22rpx;
font-size: 26rpx;
color: #f39d18;
}
.icon-jinggao31 {
......@@ -157,7 +157,7 @@
.filter-tab {
height: 60rpx;
.t1 {
font-size: 24rpx;
font-size: 26rpx;
color: #404547;
}
.t2 {
......@@ -173,7 +173,7 @@
text-align: right;
}
.text {
font-size: 24rpx;
font-size: 26rpx;
color: #197adb;
white-space: nowrap;
}
......
assets/css/tally/index.scss
......@@ -102,7 +102,7 @@
border: 1px solid #bbdcfd;
}
.pb16 {
padding-bottom: 16rpx;
padding-bottom: 30rpx;
}
.w130 {
width: 156rpx;
......@@ -136,7 +136,6 @@
}
.input-text {
.uni-input {
width: 173rpx;
height: 48rpx;
background: #e6edf0;
border-radius: 4rpx;
......
assets/css/tally/unboxing.scss
......@@ -110,7 +110,7 @@
border: 1px solid #bbdcfd;
}
.pb16 {
padding-bottom: 16rpx;
padding-bottom: 30rpx;
}
.w130 {
width: 156rpx;
......
pages/tally/index.vue
......@@ -98,84 +98,73 @@
<text class="t3 w130">品牌：</text>
<text class="t4">{{item.brand}}</text>
</view>
<view class="pb16 row verCenter bothSide">
<view class="row" style="width: 50%;">
<text class="t3 w130">单价：</text>
<text class="t4">{{item.unit_price}}</text>
<view class="pb16 row">
<text class="t3 w130">金额：</text>
<text class="t4">{{item.total_price}}</text>
</view>
<!-- 完全理货 -->
<template v-if="item.tally_status == 3">
<view class="pb16 row">
<text class="t3 w130">总数量：</text>
<text class="t4">{{item.order_numbers}}</text>
</view>
<view class="row" style="width: 50%;">
<text class="t3 w130" style="text-align: right;">金额：</text>
<text class="t4">{{item.total_price}}</text>
</template>
<!-- 1未理货2部分理货 -->
<template v-else>
<view class="pb16 row">
<text class="t3 w130">待收数量：</text>
<text class="t4">{{item.wait_tally_num}}</text>
</view>
</view>
<view class="pb16 row" style="border-bottom: 1px solid #E6EDF0;padding-bottom: 24rpx;">
<view class="pb16 row">
<text class="t3 w130">总数量：</text>
<text class="t4">{{item.order_numbers}}</text>
</view>
</template>
<view class="pb16 row verCenter">
<!-- 完全理货 -->
<template v-if="item.tally_status == 3">
<view class="row">
<text class="t3 w130">总数量：</text>
<text class="t4">{{item.order_numbers}}</text>
</view>
<text class="t3 w130">已入库数量：</text>
</template>
<!-- 1未理货2部分理货 -->
<template v-else>
<view class="row" style="width: 50%;">
<text class="t3 w130">待收数量：</text>
<text class="t4">{{item.wait_tally_num}}</text>
</view>
<view class="row" style="width: 50%;">
<text class="t3 w130" style="text-align: right;">总数量：</text>
<text class="t4">{{item.order_numbers}}</text>
</view>
<text class="t3 w130">入库数量：</text>
</template>
<view class="input-text">
<input class="uni-input" :disabled="item.tally_status == 3" type="number" inputmode="numeric" placeholder="输入" placeholder-style="color:#000;font-weight: bold;" v-model="form[index].tally_num" />
</view>
</view>
<view class="pb16 row verCenter bothSide" style="margin-top: 24rpx;">
<view class="row verCenter">
<view class="pb16 row verCenter">
<text class="t3 w130">原产地：</text>
<view class="input-text">
<!-- 完全理货 -->
<template v-if="item.tally_status == 3">
<text class="t3 w130">已入库数量：</text>
<input class="uni-input" placeholder="选择产地" placeholder-style="color:#000;font-weight: bold;" disabled="" v-model="form[index].origin" />
</template>
<!-- 1未理货2部分理货 -->
<template v-else>
<text class="t3 w130">入库数量：</text>
<input class="uni-input" placeholder="选择产地" placeholder-style="color:#000;font-weight: bold;" disabled="" @click="open(index)" v-model="form[index].origin" />
</template>
<view class="input-text">
<input class="uni-input" :disabled="item.tally_status == 3" type="number" inputmode="numeric" placeholder="输入" placeholder-style="color:#000;font-weight: bold;" v-model="form[index].tally_num" />
</view>
</view>
<view class="row verCenter rowCenter">
<text class="t3 w130" style="width:105rpx;">原产地：</text>
<view class="input-text">
<!-- 完全理货 -->
<template v-if="item.tally_status == 3">
<input class="uni-input" placeholder="选择产地" placeholder-style="color:#000;font-weight: bold;" disabled="" v-model="form[index].origin" />
</template>
<!-- 1未理货2部分理货 -->
<template v-else>
<input class="uni-input" placeholder="选择产地" placeholder-style="color:#000;font-weight: bold;" disabled="" @click="open(index)" v-model="form[index].origin" />
</template>
</view>
</view>
</view>
<view class="pb16 row verCenter bothSide" style="margin-top: 24rpx;">
<view class="row verCenter">
<text class="t3 w130">净重：</text>
<view class="input-text">
<input class="uni-input" :disabled="item.tally_status == 3" type="number" inputmode="decimal" placeholder="输入" placeholder-style="color:#000;font-weight: bold;" v-model="form[index].net_weight" />
</view>
<view class="pb16 row verCenter">
<text class="t3 w130">净重：</text>
<view class="input-text">
<input class="uni-input" :disabled="item.tally_status == 3" type="number" inputmode="decimal" placeholder="输入" placeholder-style="color:#000;font-weight: bold;" v-model="form[index].net_weight" />
</view>
<view class="row verCenter">
<text class="t3 w130" style="width:105rpx;">备注：</text>
<view class="input-text">
<template v-if="item.tally_status == 3">
<input class="uni-input" :disabled="item.tally_status == 3" type="text" placeholder="输入" placeholder-style="color:#000;font-weight: bold;" v-model="form[index].remark" maxlength="100" @click="viewChange(form[index].remark)" />
</template>
<template v-else>
<input class="uni-input" :disabled="item.tally_status == 3" type="text" placeholder="输入" placeholder-style="color:#000;font-weight: bold;" v-model="form[index].remark" maxlength="100" />
</template>
</view>
</view>
<view class="pb16 row verCenter">
<text class="t3 w130">备注：</text>
<view class="input-text">
<template v-if="item.tally_status == 3">
<input class="uni-input" :disabled="item.tally_status == 3" type="text" placeholder="输入" placeholder-style="color:#000;font-weight: bold;" v-model="form[index].remark" maxlength="100" @click="viewChange(form[index].remark)" />
</template>
<template v-else>
<input class="uni-input" :disabled="item.tally_status == 3" type="text" placeholder="输入" placeholder-style="color:#000;font-weight: bold;" v-model="form[index].remark" maxlength="100" />
</template>
</view>
</view>
<view class="row bothSide verCenter">
<view class="pb16 row verCenter">
<text class="t3 w130">理货照片：</text>
<view class="upload-list row verCenter">
<template v-if="image_list.length > 0">
<view class="pic-box" v-for="(v, i) in image_list[index]" :key="i">
......@@ -192,6 +181,8 @@
<view class="default row rowCenter verCenter" @click="chooseImageChange(index)" v-if="image_list[index].length < 4"><text class="iconfont icon-xingzhuangjiehe"></text></view>
</template>
</view>
</view>
<view class="row" style="justify-content: flex-end;">
<!-- 完全理货 -->
<template v-if="item.tally_status == 3">
<view class="btn row rowCenter verCenter disabled" @click="cancelTallyDetail(index)">取消理货</view>
......@@ -214,7 +205,6 @@
<view class="btn-list row verCenter bothSide" v-if="!tallyData.detail">
<navigator url="/pages/tally/fixBox" class="box row rowCenter verCenter" hover-class="none">合 箱</navigator>
<navigator url="/pages/tally/unboxing" class="box row rowCenter verCenter" hover-class="none">重新开箱</navigator>
<navigator url="/pages/tally/printBox" class="box row rowCenter verCenter" hover-class="none">打印箱号</navigator>
<navigator url="/pages/tally/abnormalTally" class="box row rowCenter verCenter" hover-class="none">理货异常处理</navigator>
</view>
<!-- 选择国家 -->
......@@ -265,7 +255,7 @@
curr: -1, //当前打开的是哪个产地
fixBoxStyle: '',
noexebshowFalg: true, //控制是否会触发生命周期
index: 0,
index: uni.getStorageSync('goodIndex') || 0,
item: ['型号', 'DigiKey', 'Rochester', 'TME', 'Chip1stop'],
box_sn: '', //箱号信息
wsty_id: '', //箱子id
......@@ -322,6 +312,7 @@
bindPickerChange: function(e) {
console.log('picker发送选择改变，携带值为', e.detail.value);
this.index = e.detail.value;
uni.setStorageSync('goodIndex', this.index);
this.clearInput(3);
},
/**
......@@ -640,6 +631,8 @@
this.box_sn = res.data.box_sn;
this.wsty_id = res.data.wsty_id;
this.print(); //取箱号成功则自动调用打印箱号
if (this.form.length > 0) {
// 筛选出 tally_status 等于 1 或 2 的数据
var filteredForm = this.form.filter(item => item.tally_status === 1 || item.tally_status === 2);
......@@ -822,6 +815,11 @@
icon: 'success',
duration: 2000
});
//理货提交成功后自动清空型号查询框
this.keyword = '';
this.goods_type = '';
setTimeout(() => {
this.getTallyData();
}, 2000);
......@@ -987,11 +985,10 @@
}
this.request(API.addSCTallyData, 'POST', params, true).then(res => {
if (res.code === 0) {
uni.showModal({
title: '',
content: '打印成功，请查看打印机',
showCancel: false
});
uni.showToast({
title: '打印箱号成功',
icon: 'success'
})
} else {
uni.showToast({
title: res.err_msg,
......@@ -1016,6 +1013,11 @@
setTimeout(() => {
this.is_focus_2 = true;
}, 200);
//X掉入仓号时，自动清空型号查询框
this.goods_type = '';
this.keyword = '';
this.getTallyData();
} else if (type == 3) {
this.goods_type = '';
......
pages/tally/unboxing.vue
......@@ -47,6 +47,7 @@
<text class="t3 w130">物料名称：</text>
<text class="t4">{{item.goods_title}}</text>
</view>
<!-- 完全理货显示箱号 -->
<view class="row" style="width: 50%;justify-content: flex-end;" v-if="item.tally_status == 3">
<text class="t4" style="text-align: right;color: #197adb;">{{item.box_sn}}</text>
</view>
......@@ -59,84 +60,73 @@
<text class="t3 w130">品牌：</text>
<text class="t4">{{item.brand}}</text>
</view>
<view class="pb16 row verCenter bothSide">
<view class="row" style="width: 50%;">
<text class="t3 w130">单价：</text>
<text class="t4">{{item.unit_price}}</text>
<view class="pb16 row">
<text class="t3 w130">金额：</text>
<text class="t4">{{item.total_price}}</text>
</view>
<!-- 完全理货 -->
<template v-if="item.tally_status == 3">
<view class="pb16 row">
<text class="t3 w130">总数量：</text>
<text class="t4">{{item.order_numbers}}</text>
</view>
<view class="row" style="width: 50%;">
<text class="t3 w130" style="text-align: right;">金额：</text>
<text class="t4">{{item.total_price}}</text>
</template>
<!-- 1未理货2部分理货 -->
<template v-else>
<view class="pb16 row">
<text class="t3 w130">待收数量：</text>
<text class="t4">{{item.wait_tally_num}}</text>
</view>
</view>
<view class="pb16 row" style="border-bottom: 1px solid #E6EDF0;padding-bottom: 24rpx;">
<view class="pb16 row">
<text class="t3 w130">总数量：</text>
<text class="t4">{{item.order_numbers}}</text>
</view>
</template>
<view class="pb16 row verCenter">
<!-- 完全理货 -->
<template v-if="item.tally_status == 3">
<view class="row">
<text class="t3 w130">总数量：</text>
<text class="t4">{{item.order_numbers}}</text>
</view>
<text class="t3 w130">已入库数量：</text>
</template>
<!-- 1未理货2部分理货 -->
<template v-else>
<view class="row" style="width: 50%;">
<text class="t3 w130">待收数量：</text>
<text class="t4">{{item.wait_tally_num}}</text>
</view>
<view class="row" style="width: 50%;">
<text class="t3 w130" style="text-align: right;">总数量：</text>
<text class="t4">{{item.order_numbers}}</text>
</view>
<text class="t3 w130">入库数量：</text>
</template>
<view class="input-text">
<input class="uni-input" :disabled="item.tally_status == 3" type="number" inputmode="numeric" placeholder="输入" placeholder-style="color:#000;font-weight: bold;" v-model="form[index].tally_num" />
</view>
</view>
<view class="pb16 row verCenter bothSide" style="margin-top: 24rpx;">
<view class="row verCenter">
<view class="pb16 row verCenter">
<text class="t3 w130">原产地：</text>
<view class="input-text">
<!-- 完全理货 -->
<template v-if="item.tally_status == 3">
<text class="t3 w130">已入库数量：</text>
<input class="uni-input" placeholder="选择产地" placeholder-style="color:#000;font-weight: bold;" disabled="" v-model="form[index].origin" />
</template>
<!-- 1未理货2部分理货 -->
<template v-else>
<text class="t3 w130">入库数量：</text>
<input class="uni-input" placeholder="选择产地" placeholder-style="color:#000;font-weight: bold;" disabled="" @click="open(index)" v-model="form[index].origin" />
</template>
<view class="input-text">
<input class="uni-input" :disabled="item.tally_status == 3" type="number" inputmode="numeric" placeholder="输入" placeholder-style="color:#000;font-weight: bold;" v-model="form[index].tally_num" />
</view>
</view>
<view class="row verCenter rowCenter">
<text class="t3 w130" style="width:105rpx;">原产地：</text>
<view class="input-text">
<!-- 完全理货 -->
<template v-if="item.tally_status == 3">
<input class="uni-input" placeholder="选择产地" placeholder-style="color:#000;font-weight: bold;" disabled="" v-model="form[index].origin" />
</template>
<!-- 1未理货2部分理货 -->
<template v-else>
<input class="uni-input" placeholder="选择产地" placeholder-style="color:#000;font-weight: bold;" disabled="" @click="open(index)" v-model="form[index].origin" />
</template>
</view>
</view>
</view>
<view class="pb16 row verCenter bothSide" style="margin-top: 24rpx;">
<view class="row verCenter">
<text class="t3 w130">净重：</text>
<view class="input-text">
<input class="uni-input" :disabled="item.tally_status == 3" type="number" inputmode="decimal" placeholder="输入" placeholder-style="color:#000;font-weight: bold;" v-model="form[index].net_weight" />
</view>
<view class="pb16 row verCenter">
<text class="t3 w130">净重：</text>
<view class="input-text">
<input class="uni-input" :disabled="item.tally_status == 3" type="number" inputmode="decimal" placeholder="输入" placeholder-style="color:#000;font-weight: bold;" v-model="form[index].net_weight" />
</view>
<view class="row verCenter">
<text class="t3 w130" style="width:105rpx;">备注：</text>
<view class="input-text">
<template v-if="item.tally_status == 3">
<input class="uni-input" :disabled="item.tally_status == 3" type="text" placeholder="输入" placeholder-style="color:#000;font-weight: bold;" v-model="form[index].remark" maxlength="100" @click="viewChange(form[index].remark)" />
</template>
<template v-else>
<input class="uni-input" :disabled="item.tally_status == 3" type="text" placeholder="输入" placeholder-style="color:#000;font-weight: bold;" v-model="form[index].remark" maxlength="100" />
</template>
</view>
</view>
<view class="pb16 row verCenter">
<text class="t3 w130">备注：</text>
<view class="input-text">
<template v-if="item.tally_status == 3">
<input class="uni-input" :disabled="item.tally_status == 3" type="text" placeholder="输入" placeholder-style="color:#000;font-weight: bold;" v-model="form[index].remark" maxlength="100" @click="viewChange(form[index].remark)" />
</template>
<template v-else>
<input class="uni-input" :disabled="item.tally_status == 3" type="text" placeholder="输入" placeholder-style="color:#000;font-weight: bold;" v-model="form[index].remark" maxlength="100" />
</template>
</view>
</view>
<view class="row bothSide verCenter">
<view class="pb16 row verCenter">
<text class="t3 w130">理货照片：</text>
<view class="upload-list row verCenter">
<template v-if="image_list.length > 0">
<view class="pic-box" v-for="(v, i) in image_list[index]" :key="i">
......@@ -153,6 +143,8 @@
<view class="default row rowCenter verCenter" @click="chooseImageChange(index)" v-if="image_list[index].length < 4"><text class="iconfont icon-xingzhuangjiehe"></text></view>
</template>
</view>
</view>
<view class="row" style="justify-content: flex-end;">
<!-- 完全理货 -->
<template v-if="item.tally_status == 3">
<view class="btn row rowCenter verCenter disabled" @click="cancelTallyDetail(index)">取消理货</view>
......@@ -738,6 +730,11 @@
icon: 'success',
duration: 2000
});
//理货提交成功后自动清空型号查询框
this.keyword = '';
this.goods_type = '';
setTimeout(() => {
this.getTallyData();
}, 2000);
......
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