Skip to content

梁建民 / wmsMin

Go to a project
Commit cf4286c6 by liangjianmin
Options

对于部分监管严格的货物理货时增加强提醒和显示

parent 44fe4d81
Inline Side-by-side
Showing with 71 additions and 50 deletions
pages/tally/index.vue
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<view class="fix-box"> <view class="fix-box">
<view class="column-box row bothSide verCenter"> <view class="column-box row bothSide verCenter">
<view class="input-box row verCenter"> <view class="input-box row verCenter">
<input class="uni-input" @input="handleInput($event,1)" :focus="is_focus_1" placeholder="当前箱号" placeholder-style="color:#000;font-weight: bold;" v-model="box_sn" /> <input class="uni-input" @input="handleInput($event, 1)" :focus="is_focus_1" placeholder="当前箱号" placeholder-style="color:#000;font-weight: bold;" v-model="box_sn" />
</view> </view>
<view class="action-bar row verCenter"> <view class="action-bar row verCenter">
<text class="iconfont icon-jinggao2" @click="clearInput(1)" v-if="box_sn"></text> <text class="iconfont icon-jinggao2" @click="clearInput(1)" v-if="box_sn"></text>
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</view> </view>
<view class="column-box row bothSide verCenter"> <view class="column-box row bothSide verCenter">
<view class="input-box row verCenter"> <view class="input-box row verCenter">
<input class="uni-input" :focus="is_focus_2" :disabled="form.length > 0 && step == 1 && erp_order_sn !=''" :class="{ 'disabled': form.length > 0 && step == 1 && erp_order_sn !='' }" placeholder="输入或扫描入仓号" placeholder-style="color:#000;font-weight: bold;" v-model="erp_order_sn" /> <input class="uni-input" :focus="is_focus_2" :disabled="form.length > 0 && step == 1 && erp_order_sn != ''" :class="{ 'disabled': form.length > 0 && step == 1 && erp_order_sn != '' }" placeholder="输入或扫描入仓号" placeholder-style="color:#000;font-weight: bold;" v-model="erp_order_sn" />
</view> </view>
<view class="action-bar row verCenter"> <view class="action-bar row verCenter">
<text class="iconfont icon-jinggao2" @click="clearInput(2)" v-if="erp_order_sn"></text> <text class="iconfont icon-jinggao2" @click="clearInput(2)" v-if="erp_order_sn"></text>
...@@ -43,11 +43,11 @@ ...@@ -43,11 +43,11 @@
<view class="input-box row verCenter" style="width: calc(100% - 129rpx);"> <view class="input-box row verCenter" style="width: calc(100% - 129rpx);">
<!-- 其他 --> <!-- 其他 -->
<template v-if="index == 0"> <template v-if="index == 0">
<input class="uni-input" maxlength="-1" :focus="is_focus_3" placeholder="输入或扫描" placeholder-style="color:#000;font-weight: bold;" style="width: 100%;" v-model="goods_type" @input="handleInput($event,2)" /> <input class="uni-input" maxlength="-1" :focus="is_focus_3" placeholder="输入或扫描" placeholder-style="color:#000;font-weight: bold;" style="width: 100%;" v-model="goods_type" @input="handleInput($event, 2)" />
</template> </template>
<!-- digikey等供应商--> <!-- digikey等供应商-->
<template v-else> <template v-else>
<input class="uni-input" maxlength="-1" :focus="is_focus_3" :confirm-type="'none'" :hold-keyboard="false" placeholder="输入或扫描" placeholder-style="color:#000;font-weight: bold;" style="width: 100%;" v-model="keyword" @input="handleInput($event,2)" /> <input class="uni-input" maxlength="-1" :focus="is_focus_3" :confirm-type="'none'" :hold-keyboard="false" placeholder="输入或扫描" placeholder-style="color:#000;font-weight: bold;" style="width: 100%;" v-model="keyword" @input="handleInput($event, 2)" />
</template> </template>
<text class="iconfont icon-jinggao2" @click="clearInput(3)" v-if="goods_type || keyword"></text> <text class="iconfont icon-jinggao2" @click="clearInput(3)" v-if="goods_type || keyword"></text>
</view> </view>
...@@ -56,54 +56,65 @@ ...@@ -56,54 +56,65 @@
<view class="info row verCenter" v-if="tallyData && tallyData.detail"> <view class="info row verCenter" v-if="tallyData && tallyData.detail">
<view class="grid-item row verCenter" style="width: 40%;"> <view class="grid-item row verCenter" style="width: 40%;">
<view class="t1">业务日期：</view> <view class="t1">业务日期：</view>
<view class="t2">{{tallyData.create_time_cn}}</view> <view class="t2">{{ tallyData.create_time_cn }}</view>
</view> </view>
<view class="grid-item row verCenter" style="width: 30%;"> <view class="grid-item row verCenter" style="width: 30%;">
<view class="t1">总数：</view> <view class="t1">总数：</view>
<view class="t3">{{tallyData.goods_sn_num}}</view> <view class="t3">{{ tallyData.goods_sn_num }}</view>
</view> </view>
<view class="grid-item row verCenter" style="width: 30%;"> <view class="grid-item row verCenter" style="width: 30%;">
<view class="t1">未扫描：</view> <view class="t1">未扫描：</view>
<view class="t3">{{tallyData.no_scan_num}}</view> <view class="t3">{{ tallyData.no_scan_num }}</view>
</view> </view>
<view class="grid-item row verCenter" style="width: 40%;"> <view class="grid-item row verCenter" style="width: 40%;">
<view class="t1">已扫描：</view> <view class="t1">已扫描：</view>
<view class="t3">{{tallyData.have_scan_num}}</view> <view class="t3">{{ tallyData.have_scan_num }}</view>
</view> </view>
<view class="grid-item row verCenter" style="width: 60%;"> <view class="grid-item row verCenter" style="width: 60%;">
<view class="t1">业务：</view> <view class="t1">业务：</view>
<view class="t2">{{tallyData.salesname}}</view> <view class="t2">{{ tallyData.salesname }}</view>
</view> </view>
</view> </view>
</view> </view>
<!-- 列表 --> <!-- 列表 -->
<view class="list" v-if="form.length > 0"> <view class="list" v-if="form.length > 0">
<scroll-view scroll-y="true" class="scroll-Y"> <scroll-view scroll-y="true" class="scroll-Y">
<view class="box" v-for="(item,index) in tallyData.detail" :key="index" :class="{disabled:item.tally_status == 3}"> <view class="box" v-for="(item, index) in tallyData.detail" :key="index" :class="{ disabled: item.tally_status == 3 }">
<view class="title pb16 row verCenter" style="position: relative;"> <view class="title pb16 row verCenter" style="position: relative;">
<text class="t1">{{item.goods_type}}</text> <text class="t1">{{ item.goods_type }}</text>
<text class="t2 row rowCenter verCenter" v-if="item.is_goods_check">检</text> <text class="t2 row rowCenter verCenter" v-if="item.is_goods_check">检</text>
<text style="color: #197adb;font-size: 24rpx;position: absolute;right: 0;top: 0;">{{item.declaration_type_val}}</text> <text style="color: #197adb;font-size: 24rpx;position: absolute;right: 0;top: 0;">{{ item.declaration_type_val }}</text>
</view>
<view class="pb16 row bothSide verCenter">
<view class="row" style="width: 50%;">
<text class="t3 w130">海关编码：</text>
<text class="t4" :style="{ color: isSpecialTaxCode(item.tax_sn) ? 'red' : '' }">{{ item.tax_sn }}</text>
</view>
<!-- 重点检查提醒标识 -->
<view class="row verCenter" style="width: 50%;justify-content: flex-end;" v-if="isSpecialTaxCode(item.tax_sn)">
<text class="iconfont icon-jinggao1" style="color: red;font-size: 32rpx;margin-right: 8rpx;"></text>
<text class="t4" style="text-align: right;color: red;">需重点检查COD</text>
</view>
</view> </view>
<view class="pb16 row bothSide verCenter"> <view class="pb16 row bothSide verCenter">
<view class="row" style="width: 50%;"> <view class="row" style="width: 50%;">
<text class="t3 w130">物料名称：</text> <text class="t3 w130">物料名称：</text>
<text class="t4">{{item.goods_title}}</text> <text class="t4">{{ item.goods_title }}</text>
</view> </view>
<!-- 完全理货显示箱号 --> <!-- 完全理货显示箱号 -->
<view class="row" style="width: 50%;justify-content: flex-end;" v-if="item.tally_status == 3"> <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> <text class="t4" style="text-align: right;color: #197adb;">{{ item.box_sn }}</text>
</view> </view>
</view> </view>
<view class="pb16 row"> <view class="pb16 row">
<text class="t3 w130">品牌：</text> <text class="t3 w130">品牌：</text>
<text class="t4">{{item.brand}}</text> <text class="t4">{{ item.brand }}</text>
</view> </view>
<!-- 总数量 --> <!-- 总数量 -->
<template v-if="item.tally_status == 3"> <template v-if="item.tally_status == 3">
<view class="pb16 row"> <view class="pb16 row">
<text class="t3 w130">总数量：</text> <text class="t3 w130">总数量：</text>
<text class="t4">{{item.order_numbers}}</text> <text class="t4">{{ item.order_numbers }}</text>
</view> </view>
</template> </template>
<!-- 待收数量 && 总数量 --> <!-- 待收数量 && 总数量 -->
...@@ -111,18 +122,18 @@ ...@@ -111,18 +122,18 @@
<view class="pb16 row verCenter"> <view class="pb16 row verCenter">
<view class="row" style="width: 50%;"> <view class="row" style="width: 50%;">
<text class="t3 w130">待收数量：</text> <text class="t3 w130">待收数量：</text>
<text class="t4">{{item.wait_tally_num}}</text> <text class="t4">{{ item.wait_tally_num }}</text>
</view> </view>
<view class="row" style="width: 50%;"> <view class="row" style="width: 50%;">
<text class="t3 w130">总数量：</text> <text class="t3 w130">总数量：</text>
<text class="t4">{{item.order_numbers}}</text> <text class="t4">{{ item.order_numbers }}</text>
</view> </view>
</view> </view>
</template> </template>
<view class="pb16 row"> <view class="pb16 row">
<text class="t3 w130">订单备注：</text> <text class="t3 w130">订单备注：</text>
<text class="desc">{{item.order_remark}}</text> <text class="desc">{{ item.order_remark }}</text>
</view> </view>
<view class="pb16 row verCenter"> <view class="pb16 row verCenter">
<!-- 已入库数量 --> <!-- 已入库数量 -->
...@@ -173,7 +184,7 @@ ...@@ -173,7 +184,7 @@
<view class="pic-box" v-for="(v, i) in image_list[index]" :key="i"> <view class="pic-box" v-for="(v, i) in image_list[index]" :key="i">
<image :src="v" mode="aspectFill" lazy-load="true" @click="previewChange(image_list[index], i)"></image> <image :src="v" mode="aspectFill" lazy-load="true" @click="previewChange(image_list[index], i)"></image>
<template v-if="item.tally_status != 3"> <template v-if="item.tally_status != 3">
<view class="delete row rowCenter verCenter" @click="deletePic(index,i)"><text class="iconfont icon-shanchu"></text></view> <view class="delete row rowCenter verCenter" @click="deletePic(index, i)"><text class="iconfont icon-shanchu"></text></view>
</template> </template>
</view> </view>
</template> </template>
...@@ -209,11 +220,11 @@ ...@@ -209,11 +220,11 @@
<navigator url="/pages/tally/abnormalTally" class="box row rowCenter verCenter" hover-class="none">美产商检管理</navigator> <navigator url="/pages/tally/abnormalTally" class="box row rowCenter verCenter" hover-class="none">美产商检管理</navigator>
<view style="position:relative;"> <view style="position:relative;">
<navigator url="/pages/tally/abnormalManageList" class="box row rowCenter verCenter" hover-class="none">异常管理</navigator> <navigator url="/pages/tally/abnormalManageList" class="box row rowCenter verCenter" hover-class="none">异常管理</navigator>
<text class="num row verCenter rowCenter" v-if="stayHandleCount.abnormalQty > 0">{{stayHandleCount.abnormalQty}}</text> <text class="num row verCenter rowCenter" v-if="stayHandleCount.abnormalQty > 0">{{ stayHandleCount.abnormalQty }}</text>
</view> </view>
<view style="position:relative;"> <view style="position:relative;">
<navigator url="/pages/tally/retentionList" class="box row rowCenter verCenter" hover-class="none">滞留预警</navigator> <navigator url="/pages/tally/retentionList" class="box row rowCenter verCenter" hover-class="none">滞留预警</navigator>
<text class="num row verCenter rowCenter" v-if="stayHandleCount.retentionQty > 0">{{stayHandleCount.retentionQty}}</text> <text class="num row verCenter rowCenter" v-if="stayHandleCount.retentionQty > 0">{{ stayHandleCount.retentionQty }}</text>
</view> </view>
</view> </view>
<!-- 选择国家 --> <!-- 选择国家 -->
...@@ -221,7 +232,7 @@ ...@@ -221,7 +232,7 @@
<view class="popup-content"> <view class="popup-content">
<view class="search-baar row verCenter"> <view class="search-baar row verCenter">
<text class="iconfont icon-a-riqi11"></text> <text class="iconfont icon-a-riqi11"></text>
<input type="text" class="uni-input" placeholder="请输入国家或地区名称（支持中英文）" placeholder-style="font-size:26rpx;color:#6E767A;" @input="handleInput($event,3)" v-model="origin" style="width: 100%;" /> <input type="text" class="uni-input" placeholder="请输入国家或地区名称（支持中英文）" placeholder-style="font-size:26rpx;color:#6E767A;" @input="handleInput($event, 3)" v-model="origin" style="width: 100%;" />
</view> </view>
<view class="data-list"> <view class="data-list">
<template v-if="origin_list.length > 0"> <template v-if="origin_list.length > 0">
...@@ -247,7 +258,7 @@ ...@@ -247,7 +258,7 @@
<uni-popup ref="popupTally" background-color="#F1F4F6"> <uni-popup ref="popupTally" background-color="#F1F4F6">
<view class="popup-content-sn"> <view class="popup-content-sn">
<view class="tally-title"> <view class="tally-title">
<text class="t2">{{erp_order_sn}}</text> <text class="t2">{{ erp_order_sn }}</text>
<text class="t1">有相似入仓号订单，请选择</text> <text class="t1">有相似入仓号订单，请选择</text>
</view> </view>
<view class="tally-list"> <view class="tally-list">
...@@ -259,11 +270,11 @@ ...@@ -259,11 +270,11 @@
<text class="t3 row rowCenter verCenter" style="width: 35%;">入库状态</text> <text class="t3 row rowCenter verCenter" style="width: 35%;">入库状态</text>
</view> </view>
</view> </view>
<view class="box row bothSide verCenter" v-for="(item,index) in tallyList" :key="index"> <view class="box row bothSide verCenter" v-for="(item, index) in tallyList" :key="index">
<view class="row verCenter" style="width: 90%;"> <view class="row verCenter" style="width: 90%;">
<text class="t1 row rowCenter verCenter" style="width: 45%;">{{item.erp_order_sn}}</text> <text class="t1 row rowCenter verCenter" style="width: 45%;">{{ item.erp_order_sn }}</text>
<text class="t2 row rowCenter verCenter" style="width: 25%;">{{item.order_goods_num}}</text> <text class="t2 row rowCenter verCenter" style="width: 25%;">{{ item.order_goods_num }}</text>
<text class="t2 row rowCenter verCenter" style="width: 35%;">{{item.stock_in_status_cn}}</text> <text class="t2 row rowCenter verCenter" style="width: 35%;">{{ item.stock_in_status_cn }}</text>
</view> </view>
<text class="select" @click="selecttErpOrderSn(index)">选中</text> <text class="select" @click="selecttErpOrderSn(index)">选中</text>
</view> </view>
...@@ -276,11 +287,11 @@ ...@@ -276,11 +287,11 @@
<view class="popup-content-tally-num"> <view class="popup-content-tally-num">
<view class="input-box row verCenter"> <view class="input-box row verCenter">
<text class="label">订单待收数量：</text> <text class="label">订单待收数量：</text>
<text class="tt">{{tally_info.wait_tally_num}}</text> <text class="tt">{{ tally_info.wait_tally_num }}</text>
</view> </view>
<view class="input-box row verCenter"> <view class="input-box row verCenter">
<text class="label">本次理货数量：</text> <text class="label">本次理货数量：</text>
<text class="tt">{{tally_info.tally_num}}</text> <text class="tt">{{ tally_info.tally_num }}</text>
</view> </view>
<view class="tip">若需再次提交，请确认数量</view> <view class="tip">若需再次提交，请确认数量</view>
<view class="input-box row verCenter" style="margin-bottom: 40rpx;"> <view class="input-box row verCenter" style="margin-bottom: 40rpx;">
...@@ -297,7 +308,7 @@ ...@@ -297,7 +308,7 @@
<!-- 多个纸箱提示 --> <!-- 多个纸箱提示 -->
<uni-popup ref="printScanList" background-color="#F1F4F6"> <uni-popup ref="printScanList" background-color="#F1F4F6">
<view class="popup-content-tally-num"> <view class="popup-content-tally-num">
<view class="text">{{box_sn}}有{{checkboxItems.length}}个子箱，选择你需要打印标签</view> <view class="text">{{ box_sn }}有{{ checkboxItems.length }}个子箱，选择你需要打印标签</view>
<view class="row verCenter" style="font-size: 28rpx;"> <view class="row verCenter" style="font-size: 28rpx;">
<checkbox-group @change="checkboxAllChange"> <checkbox-group @change="checkboxAllChange">
<label> <label>
...@@ -312,7 +323,7 @@ ...@@ -312,7 +323,7 @@
<view> <view>
<checkbox :value="item.value" :checked="item.checked" style="transform:scale(0.7)" color="#197adb" /> <checkbox :value="item.value" :checked="item.checked" style="transform:scale(0.7)" color="#197adb" />
</view> </view>
<view>{{item.name}}</view> <view>{{ item.name }}</view>
</label> </label>
</checkbox-group> </checkbox-group>
</scroll-view> </scroll-view>
...@@ -327,11 +338,11 @@ ...@@ -327,11 +338,11 @@
</template> </template>
<script> <script>
import { API } from '@/util/api.js'; import { API } from '@/util/api.js';
import debounce from 'lodash/debounce'; import debounce from 'lodash/debounce';
import { createArray } from '@/util/util.js'; import { createArray } from '@/util/util.js';
export default { export default {
data() { data() {
return { return {
isSubmitting: false, // 防重复点击标志 isSubmitting: false, // 防重复点击标志
...@@ -405,6 +416,15 @@ ...@@ -405,6 +416,15 @@
}, },
methods: { methods: {
/** /**
* 判断是否为特殊海关编码
* @param {String} taxSn 海关编码
*/
isSpecialTaxCode(taxSn) {
if (!taxSn) return false;
var specialCodes = ['854231', '854233', '854239', '854232'];
return specialCodes.some(code => taxSn.startsWith(code));
},
/**
* 点击遮罩层触发 * 点击遮罩层触发
*/ */
maskClick() { maskClick() {
...@@ -424,7 +444,7 @@ ...@@ -424,7 +444,7 @@
}); });
return result; return result;
}, },
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;
uni.setStorageSync('goodIndex', this.index); uni.setStorageSync('goodIndex', this.index);
...@@ -451,7 +471,7 @@ ...@@ -451,7 +471,7 @@
* @param {Object} event 输入框监听 * @param {Object} event 输入框监听
* @param {Object} type 1箱号监听 2型号监听 3输入国家监听 * @param {Object} type 1箱号监听 2型号监听 3输入国家监听
*/ */
handleInput: debounce(function(event, type) { handleInput: debounce(function (event, type) {
var value = event.target.value; var value = event.target.value;
if (type == 1) { if (type == 1) {
if (value) { if (value) {
...@@ -1432,13 +1452,13 @@ ...@@ -1432,13 +1452,13 @@
}, 200); }, 200);
} }
} }
}; };
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@import '@/assets/css/tally/index.scss'; @import '@/assets/css/tally/index.scss';
::v-deep { ::v-deep {
.uni-dialog-input { .uni-dialog-input {
font-size: 24rpx !important; font-size: 24rpx !important;
} }
...@@ -1450,5 +1470,5 @@ ...@@ -1450,5 +1470,5 @@
font-size: 26rpx !important; font-size: 26rpx !important;
font-weight: bold !important; font-weight: bold !important;
} }
} }
</style> </style>
\ No newline at end of file
util/api.js
const API_BASE = 'https://api.ichunt.com'; // const API_BASE = 'https://api.ichunt.com';
const API_BASE_OSS = 'https://image.ichunt.net'; //oss系统 // const API_BASE_OSS = 'https://image.ichunt.net'; //oss系统
const API_BASE_OSS_HK = 'http://hk.image.semour.com'; //oss系统 HK // const API_BASE_OSS_HK = 'http://hk.image.semour.com'; //oss系统 HK
const API_BASE_WMS = 'https://wms.ichunt.net'; //WMS系统 // const API_BASE_WMS = 'https://wms.ichunt.net'; //WMS系统
// const API_BASE = 'http://api.liexin.com'; const API_BASE = 'http://api.liexin.com';
// const API_BASE_OSS = 'http://image.liexindev.net'; const API_BASE_OSS = 'http://image.liexindev.net';
// const API_BASE_OSS_HK = 'http://image.liexindev.net'; //oss系统 HK const API_BASE_OSS_HK = 'http://image.liexindev.net'; //oss系统 HK
// const API_BASE_WMS = 'http://wms.liexindev.net'; //WMS系统 const API_BASE_WMS = 'http://wms.liexindev.net'; //WMS系统
const API = { const API = {
......
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