Skip to content

梁建民 / wmsMin

Go to a project
Commit c72f5fbb by LJM
Options

新理货流程上线优化2

parent f72c66c4
Inline Side-by-side
Showing with 147 additions and 28 deletions
assets/css/font.css
......@@ -11,6 +11,22 @@
-moz-osx-font-smoothing: grayscale;
}
.icon-a-juxing21:before {
content: "\e794";
}
.icon-a-juxing111:before {
content: "\e78f";
}
.icon-juxing11:before {
content: "\e790";
}
.icon-huopinchaxun:before {
content: "\e95e";
}
.icon-a-10cangkucangchu4:before {
content: "\e7a5";
}
......
assets/css/tally/abnormalTally.scss
......@@ -108,10 +108,12 @@
.t2 {
font-size: 26rpx;
color: #6e767a;
white-space: nowrap;
}
.t3 {
font-size: 26rpx;
color: #404547;
white-space: nowrap;
}
.t4 {
font-size: 26rpx;
......
assets/css/tally/index.scss
......@@ -68,11 +68,10 @@
}
}
.info {
display: grid;
grid-template-columns: 46% auto auto;
grid-gap: 12rpx;
padding: 24rpx 0;
flex-wrap: wrap;
.grid-item {
padding-bottom: 12rpx;
.t1 {
font-size: 24rpx;
color: #6e767a;
......@@ -124,6 +123,7 @@
.t3 {
font-size: 26rpx;
color: #6e767a;
white-space: nowrap;
}
.t4 {
font-size: 26rpx;
......@@ -134,6 +134,11 @@
color: #197adb;
margin-left: 16rpx;
}
.desc {
width: 80%;
font-size: 26rpx;
color: #404547;
}
.input-text {
.uni-input {
height: 48rpx;
......
pages.json
......@@ -214,6 +214,16 @@
"style": {
"navigationBarTitleText": "理货异常处理"
}
}, {
"path": "pages/tally/goods",
"style": {
"navigationBarTitleText": "货品查询"
}
}, {
"path": "pages/tally/goodsDetail",
"style": {
"navigationBarTitleText": "货品详情"
}
}],
"globalStyle": {
"navigationBarTextStyle": "black",
......
pages/home/index.vue
......@@ -144,6 +144,11 @@
name: '入库理货',
iconfont: 'icon-a-10cangkucangchu4',
tips: ''
},
{
name: '货品查询',
iconfont: 'icon-huopinchaxun',
tips: ''
}
]
};
......@@ -274,6 +279,10 @@
uni.navigateTo({
url: '/pages/tally/index'
});
} else if (item.name == '货品查询') {
uni.navigateTo({
url: '/pages/tally/goods'
});
} else {
uni.showModal({
title: '提示',
......
pages/tally/abnormalTally.vue
......@@ -74,7 +74,12 @@
<text class="num row rowCenter verCenter">{{index+1}}</text>
<!-- 左侧 -->
<view class="bar" style="width: 60%;">
<template v-if="curr == 3">
<view class="t1 mb16">{{item.abnormal_batch}}（{{item.sync_status_cn}} {{item.tally_status_cn || ''}}）</view>
</template>
<template v-else>
<view class="t1 mb16">{{item.abnormal_batch}}</view>
</template>
<view class="row verCenter mb16">
<text class="t2">入仓号：</text>
<text class="t3">{{item.erp_order_sn}}</text>
......@@ -104,12 +109,10 @@
<text class="t2">产地：</text>
<template v-if="item.origin_confirm_status == 1">
<text class="t3" style="color: #197ADB;">{{item.origin}}</text>
<text class="iconfont icon-jinggao31" style="color: #197ADB;"></text>
<text class="t4" style="margin-left: 2rpx;color: #197ADB;">已确认</text>
</template>
<template v-else>
<text class="t3">{{item.origin}}</text>
<text class="iconfont icon-jinggao31"></text>
<text class="t4" style="margin-left: 2rpx;">未确认</text>
</template>
</view>
......@@ -146,7 +149,7 @@
<template v-else>
<!-- 已装箱 产地已确认 -->
<template v-if="item.origin_confirm_status">
<view class="btn row rowCenter verCenter" @click="submitAbnormalBox(0,item.wstydl_id)">取 出</view>
<view class="btn row rowCenter verCenter" @click="submitAbnormalBox(0,item.wstydl_id,item)">取 出</view>
</template>
<view class="fix-btn row rowCenter verCenter" @click="closeBox()">封 箱</view>
</template>
......@@ -352,9 +355,9 @@
});
},
/**
* 异常型号装箱
* 异常型号装箱 1装箱 0去除
*/
submitAbnormalBox(type, wstydl_id) {
submitAbnormalBox(type, wstydl_id, item) {
//装箱的时候验证
if (type == 1) {
if (!this.box_sn) {
......@@ -365,6 +368,44 @@
});
return false;
}
} else if (type == 0) {
//取出
//明细为未推送、推送失败：该箱已封箱，是否确认取出？确认后，则将该物料从箱子中剔除，回到异常待装箱中
if (item.tally_status == 2 && (item.sync_status == 1 || item.sync_status == 4)) {
uni.showModal({
title: '',
content: '该箱已封箱，是否确认取出？确认后，则将该物料从箱子中剔除，回到异常待装箱中',
confirmText: '确认取出',
success: (res) => {
if (res.confirm) {
this.request(API.submitAbnormalBox, 'POST', { type: type, wstydl_id: wstydl_id, wsty_id: this.wsty_id }, true).then(res => {
if (res.err_code === 0) {
uni.showModal({
title: '',
content: type == 1 ? '装箱成功' : '取出成功',
showCancel: false,
success: (res) => {
if (res.confirm) {
this.getData();
} else if (res.cancel) {
console.log('用户点击取消');
}
}
});
} else {
uni.showToast({
title: res.err_msg,
icon: 'none'
});
}
});
} else if (res.cancel) {
console.log('用户点击取消');
}
}
});
return false;
}
}
this.request(API.submitAbnormalBox, 'POST', { type: type, wstydl_id: wstydl_id, wsty_id: this.wsty_id }, true).then(res => {
if (res.err_code === 0) {
......
pages/tally/index.vue
......@@ -54,26 +54,26 @@
</view>
<!-- 箱子基础信息 -->
<view class="info row verCenter" v-if="tallyData && tallyData.detail">
<view class="grid-item row verCenter">
<view class="grid-item row verCenter" style="width: 40%;">
<view class="t1">业务日期：</view>
<view class="t2">{{tallyData.create_time_cn}}</view>
</view>
<view class="grid-item row verCenter">
<view class="grid-item row verCenter" style="width: 30%;">
<view class="t1">总数：</view>
<view class="t3">{{tallyData.goods_sn_num}}</view>
</view>
<view class="grid-item row verCenter">
<view class="t1">业务：</view>
<view class="t2">{{tallyData.salesname}}</view>
</view>
<view class="grid-item row verCenter">
<view class="grid-item row verCenter" style="width: 30%;">
<view class="t1">未扫描：</view>
<view class="t3">{{tallyData.no_scan_num}}</view>
</view>
<view class="grid-item row verCenter">
<view class="grid-item row verCenter" style="width: 40%;">
<view class="t1">已扫描：</view>
<view class="t3">{{tallyData.have_scan_num}}</view>
</view>
<view class="grid-item row verCenter" style="width: 60%;">
<view class="t1">业务：</view>
<view class="t2">{{tallyData.salesname}}</view>
</view>
</view>
</view>
<!-- 列表 -->
......@@ -98,14 +98,14 @@
<text class="t3 w130">品牌：</text>
<text class="t4">{{item.brand}}</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>
</template>
<!-- 1未理货2部分理货 -->
<!-- 待收数量 && 总数量 -->
<template v-else>
<view class="pb16 row verCenter">
<view class="row" style="width: 50%;">
......@@ -119,12 +119,16 @@
</view>
</template>
<view class="pb16 row">
<text class="t3 w130">订单备注：</text>
<text class="desc">{{item.order_remark || '这是订单备注这是订单备注这是订单备注这是订单备注这是订单备注'}}</text>
</view>
<view class="pb16 row verCenter">
<!-- 完全理货 -->
<!-- 已入库数量 -->
<template v-if="item.tally_status == 3">
<text class="t3 w130">已入库数量：</text>
</template>
<!-- 1未理货2部分理货 -->
<!-- 入库数量 -->
<template v-else>
<text class="t3 w130">入库数量：</text>
</template>
......@@ -135,11 +139,11 @@
<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" 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>
......@@ -152,7 +156,7 @@
</view>
</view>
<view class="pb16 row verCenter">
<text class="t3 w130">备注：</text>
<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)" />
......@@ -179,11 +183,11 @@
<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>
<!-- 完全理货 -->
<!-- 取消理货 -->
<template v-if="item.tally_status == 3">
<view class="btn row rowCenter verCenter disabled" @click="cancelTallyDetail(index)">取消理货</view>
</template>
<!-- 1未理货2部分理货 -->
<!-- 提交 -->
<template v-else>
<view class="btn row rowCenter verCenter" @click="submitTallyDetail(index)">提 交</view>
</template>
......
pages/tally/unboxing.vue
......@@ -4,7 +4,7 @@
<input class="uni-input" placeholder="输入或扫描箱号" :focus="is_focus_1" placeholder-style="color:#000;font-weight: bold;" v-model="box_sn" @input="handleInput($event,1)" />
<view class="action-bar row verCenter">
<text class="iconfont icon-jinggao2" @click="clearInput(1)" v-if="box_sn"></text>
<template v-if="box_sn && tallyData.detail && tallyData.detail.length > 0">
<template v-if="box_sn && is_unboxing && tallyData.detail && tallyData.detail.length > 0">
<view class="btn1 row rowCenter verCenter" @click="closeBox()">重新封箱</view>
</template>
<template v-else>
......@@ -205,6 +205,7 @@
export default {
data() {
return {
is_unboxing: false,
is_focus_1: true, //获取焦点动态化
is_focus_2: false, //获取焦点动态化
box_sn: '',
......@@ -281,7 +282,7 @@
var value = event.target.value;
if (type == 1) {
if (value) {
this.unboxing();
this.getTallyData();
}
} else if (type == 2) {
if (value) {
......@@ -323,7 +324,14 @@
}
this.request(API.reOpenBox, 'POST', { box_sn: this.box_sn }, true).then(res => {
if (res.err_code === 0) {
uni.showToast({
title: '开箱成功',
icon: 'success'
})
setTimeout(() => {
this.is_unboxing = true; //表示开箱成功
this.getTallyData();
}, 2000)
} else {
this.form = [];
uni.showModal({
......@@ -762,6 +770,26 @@
* 理货明细撤销
*/
cancelTallyDetail(index) {
//若该箱状态为“已封箱”则，则需校验该物料明细的推送状态
if (this.tallyData.tally_status == 2) {
if (this.form[index].sync_status == 1 || this.form[index].sync_status == 4) {
uni.showModal({
title: '',
content: '该箱已封箱，是否确认从该箱中取出？',
confirmText: '确认取出',
success: (res) => {
if (res.confirm) {
this.$refs.canelInputDialog.open();
this.formIndex = index;
} else if (res.cancel) {
console.log('用户点击取消');
}
}
});
return false;
}
}
//推送状态为 未推送,推送失败
if (this.form[index].sync_status == 1 || this.form[index].sync_status == 4) {
this.$refs.canelInputDialog.open();
......
static/iconfont.ttf
No preview for this file type
util/api.js
......@@ -317,7 +317,11 @@ const API = {
/**
* 根据物料获取入仓号
*/
getErpOrderSn: API_BASE + '/supplywechatwms/getErpOrderSn'
getErpOrderSn: API_BASE + '/supplywechatwms/getErpOrderSn',
/**
* 获取货品
*/
getBoxData: API_BASE + '/supplywechatwms/getBoxData'
}
......
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