Skip to content

梁建民 / wmsMin

Go to a project
Commit c6d5b1ec by LJM
Options

理货

parent 55b3459b
Inline Side-by-side
Showing with 836 additions and 236 deletions
assets/css/tallyGoods/confirm.scss
.page-box {
margin-top: 24rpx;
padding: 0 24rpx;
padding: 0 24rpx 24rpx 24rpx;
.scanBarcode {
height: 88rpx;
background: #ffffff;
......@@ -160,6 +160,7 @@
}
}
.model-upload-list {
border-top: 1rpx solid #e6edf0;
.box {
height: 80rpx;
border-bottom: 1rpx solid #e6edf0;
......@@ -219,5 +220,8 @@
border-radius: 4rpx;
font-size: 28rpx;
color: #ffffff;
&.disabled{
opacity: 0.7;
}
}
}
assets/css/tallyGoods/manualMerge.scss
......@@ -51,8 +51,10 @@
border-top: 1px solid #e6edf0;
padding-top: 24rpx;
.t1 {
width: 110rpx;
font-size: 22rpx;
color: #6e767a;
white-space: nowrap;
margin-right: 29rpx;
}
.t2 {
......
assets/css/tallyGoods/originSplit.scss
......@@ -132,3 +132,86 @@
color: #ffffff;
}
}
.popup-content {
padding: 28rpx 24rpx 24rpx 24rpx;
.selected-items {
flex-wrap: wrap;
.box {
padding: 0 12rpx;
height: 44rpx;
background: #ffffff;
border-radius: 4rpx;
border: 1rpx solid #197adb;
margin-right: 16rpx;
margin-bottom: 16rpx;
.text {
font-size: 24rpx;
color: #197adb;
}
.close {
margin-left: 5rpx;
font-size: 36rpx;
color: #197adb;
}
}
}
.search-baar {
height: 88rpx;
background: #ffffff;
border-radius: 4rpx;
padding-left: 24rpx;
margin-bottom: 16rpx;
.iconfont {
font-size: 36rpx;
color: #6e767a;
}
.uni-input {
margin-left: 15rpx;
font-size: 28rpx;
color: #404547;
}
}
.data-list {
background: #ffffff;
border-radius: 4rpx;
margin-bottom: 22rpx;
max-height: 504rpx;
overflow-y: auto;
.box {
margin: 0 24rpx;
height: 84rpx;
border-bottom: 1rpx solid #e6edf0;
&:last-child {
border-bottom: none;
}
.text {
font-size: 26rpx;
color: #404547;
}
.check-ico {
width: 24rpx;
height: 25rpx;
background: url('https://img.ichunt.com/images/ichunt/202309/14/3743c01230310f62a2afa41a6c2eea96.png') no-repeat center;
background-size: contain;
display: block;
}
&.curr {
.text {
color: #197adb;
}
.check-ico {
background: url('https://img.ichunt.com/images/ichunt/202309/14/e651ddae61b5f02af4129f723b2cf74f.png') no-repeat center;
background-size: contain;
}
}
}
}
.pop-btn {
height: 88rpx;
background: #197adb;
border-radius: 4rpx;
font-size: 28rpx;
color: #ffffff;
}
}
pages.json
......@@ -67,7 +67,7 @@
}, {
"path": "pages/goods/tally",
"style": {
"navigationBarTitleText": "理货列表"
"navigationBarTitleText": "异常理货"
}
}, {
"path": "pages/goods/tallyExectionDetail",
......
pages/goods/tally.vue
......@@ -4,7 +4,7 @@
<view class="search-box">
<view class="search-input row bothSide verCenter">
<text class="iconfont icon-a-riqi11"></text>
<input type="text" @input="inputChange()" placeholder="请手动输入入仓号或扫描" class="uni-input" v-model="number" placeholder-style="color:#6e767a" />
<input type="text" @input="inputChange()" placeholder="请输入入仓号" class="uni-input" v-model="number" placeholder-style="color:#6e767a" />
<text class="scan iconfont icon-juxing6" @click="scanChange()"></text>
</view>
</view>
......@@ -92,7 +92,7 @@ export default {
return {
currentIndex: 0,
is_complete: false,
textArr: ['等待理货', '理货异常'],
textArr: ['等待回复', '商务已回复'],
number: '',
total: 0,
page: 1,
......
pages/tallyGoods/confirm.vue
<template>
<view class="page-box">
<div class="scanBarcode row rowCenter verCenter">
<div class="scanBarcode row rowCenter verCenter" @click="scanChange()">
<text class="iconfont icon-juxing6"></text>
<text class="tt">扫描理货单二维码</text>
</div>
......@@ -10,7 +10,7 @@
<view class="input-wrap row verCenter bothSide">
<view class="row verCenter">
<text class="arrow"></text>
<input type="text" v-model="form.erp_order_sn" class="uni-input" placeholder="请输入入仓号(必填)" placeholder-style="color:#404547;font-weight:bold;" />
<input type="text" @input="onInput()" v-model="form.erp_order_sn" class="uni-input" placeholder="请输入" placeholder-style="color:#404547;font-weight:bold;" />
</view>
<text class="inspection row rowCenter verCenter">商检</text>
</view>
......@@ -44,41 +44,53 @@
</view>
<view class="box row bothSide verCenter">
<text class="label">产地拆分（选填）</text>
<navigator class="input-wrap-width row verCenter" url="/pages/tallyGoods/originSplit" hover-class="none">
<text class="text">请选择</text>
<navigator class="input-wrap-width row verCenter" :url="'/pages/tallyGoods/originSplit?erp_order_sn=' + form.erp_order_sn" hover-class="none">
<text class="text">{{ form.detail_json.length > 0 ? '已拆分' + form.detail_json.length : '请选择' }}</text>
<text class="iconfont icon-sanjiaoxing2"></text>
</navigator>
</view>
<view class="box row bothSide verCenter">
<text class="label">手动合箱（选填）</text>
<navigator class="input-wrap-width row verCenter" url="/pages/tallyGoods/manualMerge" hover-class="none">
<text class="text">请选择</text>
<navigator class="input-wrap-width row verCenter" :url="'/pages/tallyGoods/manualMerge?erp_order_sn=' + form.erp_order_sn + '&fix_erp_order_sn=' + form.fix_erp_order_sn" hover-class="none">
<text class="text">{{ form.fix_erp_order_sn ? '已合箱' : '请选择' }}</text>
<text class="iconfont icon-sanjiaoxing2"></text>
</navigator>
</view>
</view>
<view class="section">
<view class="section" v-if="list.length > 0">
<!-- 商检图片上传 -->
<view class="upload-box">
<view class="title row bothSide verCenter">
<view class="title row bothSide verCenter" v-if="goods_check_pic_list.length > 0">
<text class="tt-l">商检图片上传（仅商检必填）</text>
<template v-if="goods_check_pic_list[2].length > 0">
<text class="tt-r">3/3</text>
</template>
<template v-else-if="goods_check_pic_list[1].length > 0">
<text class="tt-r">2/3</text>
</template>
<template v-else-if="goods_check_pic_list[0].length > 0">
<text class="tt-r">1/3</text>
</template>
<template v-else>
<text class="tt-r">0/3</text>
</template>
</view>
<view class="model-upload-list">
<view class="box row bothSide verCenter curr">
<view class="box row bothSide verCenter" v-for="(item, index) in list" :key="index" :class="{ curr: goods_check_pic_list[index].length > 0 }">
<view class="file row verCenter">
<text class="t1">74VCX162244MTDX</text>
<text class="t2">已上传&nbsp;3张</text>
<text class="clear">清空</text>
<text class="t1">{{ item.model }}</text>
<template v-if="goods_check_pic_list[index].length > 0">
<text class="t2" @click="previewChange(goods_check_pic_list[index], 0)">已上传&nbsp;{{ goods_check_pic_list[index].length }}张</text>
<text class="clear" @click="clearFn(index)">清空</text>
</template>
</view>
<view class="file-btn row verCenter">
<view class="file-btn row verCenter" @click="uploadBusinessChange(index)">
<template v-if="goods_check_pic_list[index].length > 0">
<text class="t1">继续上传</text>
<text class="iconfont icon-sanjiaoxing2"></text>
</view>
</view>
<view class="box row bothSide verCenter">
<view class="file row verCenter"><text class="t1">74VCX</text></view>
<view class="file-btn row verCenter">
</template>
<template v-else>
<text class="t1">上传图片</text>
</template>
<text class="iconfont icon-sanjiaoxing2"></text>
</view>
</view>
......@@ -86,15 +98,16 @@
</view>
</view>
<view class="section" style="margin-bottom: 48rpx;">
<!-- 采购单上传 -->
<view class="upload-box">
<view class="title row bothSide verCenter">
<text class="tt-l">采购单上传（选填）</text>
<text class="tt-r">{{ form.pur_pic.length }}/4</text>
<text class="tt-r">{{ image_list.length }}/4</text>
</view>
<view class="upload-list row verCenter">
<template v-if="form.pur_pic.length > 0">
<view class="pic-box" v-for="(v, index) in form.pur_pic" :key="index">
<image :src="v" mode="aspectFill" lazy-load="true" @click="previewChange(form.pur_pic, index)"></image>
<template v-if="image_list.length > 0">
<view class="pic-box" v-for="(v, index) in image_list" :key="index">
<image :src="v" mode="aspectFill" lazy-load="true" @click="previewChange(image_list, index)"></image>
<view class="delete row rowCenter verCenter" @click="deletePic(index)"><text class="iconfont icon-shanchu"></text></view>
</view>
</template>
......@@ -102,14 +115,13 @@
</view>
</view>
</view>
<view class="btn row rowCenter verCenter" @click="submit()">确认提交</view>
<view class="btn row rowCenter verCenter" @click="submit()" :class="{ disabled: disabled }">确认提交</view>
</view>
</template>
<script>
import { API } from '@/util/api.js';
import { titleCase } from '@/util/util.js';
import w_md5 from '../../js_sdk/zww-md5/w_md5.js';
export default {
data() {
......@@ -117,38 +129,218 @@ export default {
noexebshowFalg: true, //控制是否会触发生命周期
customs_clearance_price_options: ['无', '有'], //清关费选项
currentIndex: 0,
image_list: [], //图片列表
goods_check_pic_list: [], //商检图片列表
maxNum: 10, //最大上传图片数量
list: [], //商检型号列表
disabled: false,
form: {
erp_order_sn: 'B123456', //入仓号
customs_clearance_price: '', //清关费
erp_order_sn: '', //入仓号
customs_clearance_price: 0, //清关费
box_num: '', //箱子
board_num: '', //板子
gross_weight: '', //合计毛重
detail_json: [], //产地拆分 && 商检图片
pic_json: [], //商检图片
detail_json: [], //产地拆分数据
fix_erp_order_sn: '', //手动合箱
pur_pic: '' //采购单上传
}
};
},
onLoad(options) {},
watch: {
image_list(arr) {
if (arr.length > 0) {
this.form.pur_pic = arr.join(',');
} else {
this.form.pur_pic = '';
}
}
},
onLoad() {
uni.removeStorageSync('paramsOrigin');
},
onShow() {
//更新合箱数据
uni.$on('updateData', data => {
if (data.length > 0) {
this.form.fix_erp_order_sn = data.join(',');
} else {
this.form.fix_erp_order_sn = '';
}
});
//更新产地拆分国家的数据
uni.$on('updateOriginData', data => {
if (data) {
this.form.detail_json = data.detail_json;
uni.removeStorageSync('paramsOrigin');
uni.setStorageSync('paramsOrigin', data);
}
});
},
methods: {
/**
* 扫描二维码
*/
scanChange() {
this.form.logistics_number = '';
uni.scanCode({
success: res => {
console.log(res);
if (res.errMsg == 'scanCode:ok') {
this.form.logistics_number = res.result;
this.form.erp_order_sn = res.result;
this.checkErpOrderSnIsTally();
}
},
fail: function(res) {
console.log(res);
uni.showToast({
title: '扫码失败',
icon: 'error'
title: '扫码失败，请重试',
icon: 'none'
});
}
});
},
onInput() {
// 清除之前的定时器
clearTimeout(this.timer);
this.timer = setTimeout(() => {
this.checkErpOrderSnIsTally();
}, 800);
},
/**
* 检测入仓号是否理货
*/
checkErpOrderSnIsTally() {
this.request(API.checkErpOrderSnIsTally, 'GET', { erp_order_sn: this.form.erp_order_sn }, true).then(res => {
if (res.err_code === 0) {
this.getTallyGoods();
this.disabled = false;
} else {
this.disabled = true;
uni.showModal({
content: res.err_msg,
showCancel: false
});
}
});
},
/**
* 获取入仓号的理货数据
*/
getTallyGoods() {
this.request(API.getTallyGoods, 'GET', { erp_order_sn: this.form.erp_order_sn }, true).then(res => {
if (res.err_code === 0) {
this.list = res.data.entrys;
const length = res.data.entrys.length;
this.goods_check_pic_list = Array.from({ length }, () => []);
this.form.pic_json = res.data.entrys.map(item => ({
ptEntryID: item.ptEntryID,
goods_check_pic: ''
}));
} else {
this.list = [];
uni.showToast({
title: res.err_msg,
icon: 'none'
});
}
});
},
/**
* @param {Object} index
* 清空对应的商检图片
*/
clearFn(index) {
uni.showModal({
title: '提示',
content: '您确定清空嘛？',
showCancel: true,
cancelText: '取消',
confirmText: '确定',
success: res => {
if (res.confirm) {
// 用户点击了确定按钮，执行相关操作
this.goods_check_pic_list[index] = [];
this.form.pic_json[index].goods_check_pic = '';
this.$forceUpdate();
} else if (res.cancel) {
// 用户点击了取消按钮，取消操作
}
}
});
},
/**
*商检图片上传
*/
uploadBusinessChange(index) {
// 使用 chooseImage选择图片
uni.chooseImage({
sizeType: ['original', 'compressed'],
sourceType: ['album', 'camera'],
success: chooseImageRes => {
console.log('选择图片成功：', chooseImageRes);
// 显示loading
uni.showLoading({
title: '上传中...'
});
// 获取选择的图片路径数组
const imagePaths = chooseImageRes.tempFilePaths;
// 遍历图片路径数组，对每张图片进行压缩
imagePaths.forEach(imagePath => {
// 使用compressImage 压缩图片
uni.compressImage({
src: imagePath,
quality: 50, //压缩质量，范围0～100，数值越小，质量越低，压缩率越高
success: compressedRes => {
console.log('压缩图片成功：', compressedRes);
// 获取压缩后的图片路径
const compressedImagePath = compressedRes.tempFilePath;
// 在这里处理压缩后的图片，上传到服务器
uni.uploadFile({
url: API.uploadImage + '?sys_type=4',
filePath: compressedImagePath,
name: 'file',
header: {
'Content-Type': 'multipart/form-data'
},
success: uploadFileRes => {
console.log('服务器上传图片成功：', uploadFileRes);
uni.hideLoading();
let data = JSON.parse(uploadFileRes.data);
if (data.code === 0) {
this.goods_check_pic_list[index].push(data.data.oss_image_url);
this.form.pic_json[index].goods_check_pic = this.goods_check_pic_list[index].join(',');
this.$forceUpdate();
} else {
uni.showToast({
title: data.msg,
icon: 'none'
});
}
},
fail: error => {
console.log('上传图片失败：', error);
uni.hideLoading();
}
});
},
fail: err => {
console.log('压缩图片失败：', err);
}
});
});
}
});
},
/**
* 预览图片
* @param {Object} img
* @param {Object} index
*/
previewChange(img, index) {
this.noexebshowFalg = false; //不允许再次触发onshow这个生命周期
uni.previewImage({
......@@ -156,59 +348,88 @@ export default {
urls: img
});
},
/**
* 删除图片
* @param {Object} index
*/
deletePic(index) {
this.form.check_in_pic.splice(index, 1);
},
/**
* 选择图片
*/
chooseImageChange() {
this.noexebshowFalg = false; //不允许再次触发onshow这个生命周期
var self = this;
var time = parseInt(new Date().getTime() / 1000);
this.noexebshowFalg = false;
// 使用 chooseImage选择图片
uni.chooseImage({
count: 4,
count: this.maxNum,
sizeType: ['original', 'compressed'],
sourceType: ['album', 'camera'],
success: chooseImageRes => {
console.log('选择图片成功：', chooseImageRes);
// 显示loading
uni.showLoading({
title: '上传中...'
});
const tempFilePaths = chooseImageRes.tempFilePaths;
let maxNum = tempFilePaths.length * 1 + self.form.check_in_pic.length * 1;
if (maxNum > 4) {
// 获取选择的图片路径数组
const imagePaths = chooseImageRes.tempFilePaths;
// 判断选择的图片数量是否超过最大限制数量
let maxNum = Number(imagePaths.length) + Number(this.image_list.length); //当前上传的+已经上传的
if (maxNum > this.maxNum) {
uni.hideLoading();
uni.showToast({
title: '图片不超过4张'
title: '图片不超过' + this.maxNum + '张',
icon: 'none'
});
return false;
}
for (let i = 0; i < tempFilePaths.length; i++) {
console.log(tempFilePaths[i]);
// 遍历图片路径数组，对每张图片进行压缩
imagePaths.forEach(imagePath => {
// 使用compressImage 压缩图片
uni.compressImage({
src: imagePath,
quality: 50, //压缩质量，范围0～100，数值越小，质量越低，压缩率越高
success: compressedRes => {
console.log('压缩图片成功：', compressedRes);
// 获取压缩后的图片路径
const compressedImagePath = compressedRes.tempFilePath;
// 在这里处理压缩后的图片，上传到服务器
uni.uploadFile({
url: API.upload,
filePath: tempFilePaths[i],
name: 'upload',
formData: {
source: '1',
k1: time,
k2: w_md5.hex_md5_32(w_md5.hex_md5_32(String(time)) + 'fh6y5t4rr351d2c3bryi')
url: API.uploadImage + '?sys_type=4',
filePath: compressedImagePath,
name: 'file',
header: {
'Content-Type': 'multipart/form-data'
},
success: uploadFileRes => {
console.log('服务器上传图片成功：', uploadFileRes);
uni.hideLoading();
var data = JSON.parse(uploadFileRes.data);
console.log(data);
if (data.code === 200) {
self.form.check_in_pic.push(data.data[0]);
let data = JSON.parse(uploadFileRes.data);
if (data.code === 0) {
this.image_list.push(data.data.oss_image_url);
} else {
uni.showToast({
title: data.message,
icon: 'error'
title: data.msg,
icon: 'none'
});
}
},
fail: error => {
console.log('上传图片失败：', error);
uni.hideLoading();
console.log(error);
}
});
},
fail: err => {
console.log('压缩图片失败：', err);
}
});
});
}
});
},
......@@ -232,8 +453,35 @@ export default {
});
return false;
}
this.request(API.addCheckIn, 'POST', this.form, true).then(res => {
if (this.disabled) {
uni.showModal({
content: '该入仓号已经理货,禁止重复理货',
showCancel: false
});
return false;
}
if (!this.form.box_num) {
uni.showModal({
content: '请填写箱子数',
showCancel: false
});
return false;
}
if (!this.form.board_num) {
uni.showModal({
content: '请填写板子数',
showCancel: false
});
return false;
}
if (!this.form.gross_weight) {
uni.showModal({
content: '请填写箱毛重',
showCancel: false
});
return false;
}
this.request(API.submitTallyGoods, 'POST', this.form, true).then(res => {
if (res.err_code === 0) {
uni.showModal({
title: '提示',
......
pages/tallyGoods/manualMerge.vue
......@@ -2,7 +2,7 @@
<view class="page-box">
<view class="title row bothSide verCenter">
<text class="t1">当前入仓号</text>
<text class="t2">B123456</text>
<text class="t2">{{ erp_order_sn }}</text>
</view>
<view class="select-split">
<view class="box">
......@@ -14,39 +14,39 @@
<view class="uni-text" @click="open()">请选择</view>
<text class="iconfont icon-sanjiaoxing1"></text>
</view>
<view class="boxed_result row verCenter">
<view class="boxed_result row" v-if="filter_list.length > 0">
<text class="t1">合箱结果：</text>
<view class="row verCenter">
<text class="t2">B123459</text>
<text class="t3">+</text>
<text class="t2">B123459</text>
<text class="t3">+</text>
<text class="t2">B123459</text>
<view class="row verCenter" style="flex-wrap: wrap;">
<block v-for="(item, index) in filter_list" :key="index">
<text class="t2">{{ item }}</text>
<text v-if="index < filter_list.length - 1" class="t3">+</text>
</block>
</view>
</view>
</view>
</view>
<view class="btn row rowCenter verCenter" @click="submit()">确 认</view>
<view class="btn-reset row rowCenter verCenter" @click="submit()">重 置</view>
<view class="btn-reset row rowCenter verCenter" @click="reset()">重 置</view>
<!-- 选择箱号 -->
<uni-popup ref="popup" background-color="#F1F4F6">
<view class="popup-content">
<view class="selected-items row">
<view class="box row verCenter" v-for="(item, index) in 10" :key="index">
<text class="text">B123456</text>
<text class="close">×</text>
<view class="box row verCenter" v-for="(item, index) in filter_list" :key="index">
<text class="text">{{ item }}</text>
<text class="close" @click="deleteChange(item)">×</text>
</view>
</view>
<view class="search-baar row verCenter">
<text class="iconfont icon-a-riqi11"></text>
<input type="text" class="uni-input" placeholder="请输入箱号" placeholder-style="font-size:26rpx;color:#6E767A;" />
<input type="text" class="uni-input" placeholder="请输入箱号" placeholder-style="font-size:26rpx;color:#6E767A;" @input="onInput" v-model="searchParams.erp_order_sn" />
</view>
<view class="data-list">
<view class="box row bothSide verCenter curr" v-for="(item, index) in 30" :key="index">
<text class="text">B0000{{ index }}</text>
<view class="check-ico"></view>
<view class="box row bothSide verCenter" v-for="(item, index) in list" :key="index" :class="{ curr: filter_status[index] }">
<text class="text">{{ item.name }}</text>
<view class="check-ico" @click="filterChange(index)"></view>
</view>
</view>
<view class="pop-btn row rowCenter verCenter">确 认</view>
<view class="pop-btn row rowCenter verCenter" @click="confirmChange">确 认</view>
</view>
</uni-popup>
</view>
......@@ -54,23 +54,77 @@
<script>
import { API } from '@/util/api.js';
import { createArray } from '@/util/util.js';
export default {
data() {
return {
goods_list_index: -1,
goods_list: ['1-2328702-0', '1-2328701']
erp_order_sn: '',
list: [],
fix_erp_order_sn: '', //已选择的合箱数据
filter_list: [], //过滤处理的数据
filter_status: [], //控制状态
searchParams: {
erp_order_sn: ''
}
};
},
onLoad(options) {},
onLoad(options) {
this.erp_order_sn = options.erp_order_sn || '';
//携带的子箱号数据
this.fix_erp_order_sn = options.fix_erp_order_sn || '';
if (this.fix_erp_order_sn) {
this.filter_list = this.fix_erp_order_sn.split(',');
}
},
onShow() {
this.getData();
},
methods: {
open() {
this.$refs.popup.open('bottom');
},
onInput() {
// 清除之前的定时器
clearTimeout(this.timer);
this.timer = setTimeout(() => {
this.list = []; //数组清空
this.getData();
}, 800);
},
/**
* 找出false对应的下标
* @param {Object} arr
* @param {Object} target
*/
findIndex(arr, target) {
const result = [];
arr.map((item, index) => {
if (item === target) {
result.push(index);
}
});
return result;
},
/**
*筛选过滤出选中的元素
*/
filterChange(index) {
this.$set(this.filter_status, index, (this.filter_status[index] = !this.filter_status[index]));
let filter_arr = this.findIndex(this.filter_status, true);
this.filter_list = filter_arr.map(i => this.list[i].name);
},
getData() {
this.request(API.getCheckInList, 'POST', { number: this.id }, this.loading).then(res => {
this.request(API.getFixErpOrderSn, 'POST', { erp_order_sn: this.searchParams.erp_order_sn }, true).then(res => {
if (res.err_code === 0) {
this.form.checkIn = res.data[0];
this.list = res.data;
this.filter_status = createArray(this.list.length, false);
//携带的数据转化
if (this.fix_erp_order_sn) {
const fixSnArray = this.fix_erp_order_sn.split(',');
this.filter_status = this.list.map(item => fixSnArray.includes(item.name));
}
} else {
uni.showToast({
title: res.err_msg,
......@@ -79,7 +133,27 @@ export default {
}
});
},
submit() {}
confirmChange() {
this.$refs.popup.close();
},
submit() {
uni.$emit('updateData', this.filter_list);
uni.navigateBack({
delta: 1
});
},
reset() {
this.filter_list = [];
this.filter_status.fill(false);
},
deleteChange(val) {
const matchingIndex = this.list.findIndex(item => item.name === val);
if (matchingIndex !== -1) {
this.filter_status[matchingIndex] = false;
this.filter_list = this.filter_list.filter(item => item !== val);
this.$forceUpdate();
}
}
}
};
</script>
......
pages/tallyGoods/originSplit.vue
......@@ -2,7 +2,7 @@
<view class="page-box">
<view class="title row bothSide verCenter">
<text class="t1">入仓号</text>
<text class="t2">B123456</text>
<text class="t2">{{ erp_order_sn }}</text>
</view>
<view class="select-split">
<view class="box">
......@@ -11,8 +11,8 @@
<text class="t2">选择需要拆分型号</text>
</view>
<view class="pick-list row bothSide verCenter">
<picker @change="bindPickerChange" :value="goods_list_index" :range="goods_list">
<view class="uni-text">{{ goods_list[goods_list_index] || '请选择型号' }}</view>
<picker @change="bindPickerChange($event, 1)" :value="goods_index" :range="goods_list" :range-key="'model'" style="width: 80%;">
<view class="uni-text">{{ goods_list[goods_index].model || '请选择型号' }}</view>
</picker>
<text class="iconfont icon-sanjiaoxing1"></text>
</view>
......@@ -23,83 +23,159 @@
<text class="t2">&nbsp;&nbsp;选择拆分数量</text>
</view>
<view class="pick-list row bothSide verCenter">
<picker @change="bindPickerChange" :value="goods_list_index" :range="goods_list">
<view class="uni-text">{{ goods_list[goods_list_index] || '请选择拆分数量' }}</view>
<picker @change="bindPickerChange($event, 2)" :value="index" :range="num_arr" style="width: 80%;">
<view class="uni-text">{{ num_arr[index] || '请选择拆分数量' }}</view>
</picker>
<text class="iconfont icon-sanjiaoxing1"></text>
</view>
</view>
</view>
<view class="text-details">
<view class="text-details" v-if="tally_num > 0">
<view class="text-row row verCenter bothSide" style="margin-bottom: 20rpx;">
<view class="left">
<text class="t1">原产国家：</text>
<text class="t2">美国</text>
<text class="t2">{{ goods_list[goods_index].origin || '' }}</text>
</view>
<view class="right"></view>
</view>
<view class="text-row row verCenter bothSide">
<view class="left">
<text class="t1">订单数量：</text>
<text class="t2">1000</text>
<text class="t2">{{ goods_list[goods_index].qty }}</text>
</view>
<view class="right">
<text class="t1">剩余拆分：</text>
<text class="t2">10,000</text>
<text class="t2">{{ goods_list[goods_index].qty }}</text>
</view>
</view>
</view>
<view class="select-split-detail">
<view class="box">
<view class="label">产地拆分1</view>
<view class="select-split-detail" v-if="tally_num > 0">
<view class="box" v-for="(item, index) in tally_num" :key="index">
<view class="label">产地拆分&nbsp;{{ index + 1 }}</view>
<view class="pick-list row bothSide verCenter">
<view class="wrap row verCenter">
<picker @change="bindPickerChange" :value="goods_list_index" :range="goods_list">
<view class="uni-text">{{ goods_list[goods_list_index] || '请选择国家地区' }}</view>
</picker>
<view class="uni-text" @click="open(index)">{{ detail_json[index].origin ? detail_json[index].origin : '请选择国家地区' }}</view>
<text class="iconfont icon-sanjiaoxing1"></text>
</view>
<view class="input-wrap"><input type="number" inputmode="numeric" placeholder="请输入拆分数量" class="uni-input" placeholder-style="color:#404547;font-weight:bold;" /></view>
<view class="input-wrap"><input type="number" inputmode="numeric" placeholder="请输入拆分数量" class="uni-input" placeholder-style="color:#404547;font-weight:bold;" v-model="detail_json[index].tally_num" /></view>
</view>
</view>
<view class="box">
<view class="label">产地拆分2</view>
<view class="pick-list row bothSide verCenter">
<view class="wrap row verCenter">
<picker @change="bindPickerChange" :value="goods_list_index" :range="goods_list">
<view class="uni-text">{{ goods_list[goods_list_index] || '请选择国家地区' }}</view>
</picker>
<text class="iconfont icon-sanjiaoxing1"></text>
</view>
<view class="input-wrap"><input type="number" inputmode="numeric" placeholder="请输入拆分数量" class="uni-input" placeholder-style="color:#404547;font-weight:bold;" /></view>
<template v-if="tally_num > 0 && goods_index != -1">
<view class="btn row rowCenter verCenter" @click="submit()">确认拆分</view>
</template>
<template v-else>
<view class="btn row rowCenter verCenter" @click="submit()" style="margin-top: 40rpx;">确认拆分</view>
</template>
<!-- 选择国家 -->
<uni-popup ref="popup" background-color="#F1F4F6">
<view class="popup-content">
<view class="search-baar row verCenter">
<text class="iconfont icon-a-riqi11"></text>
<input type="text" class="uni-input" placeholder="请输入国家或地区名称（支持中英文）" placeholder-style="font-size:26rpx;color:#6E767A;" @input="onInput" v-model="origin" style="width: 100%;" />
</view>
<view class="data-list">
<view class="box row bothSide verCenter" v-for="(item, index) in origin_list" :key="index" :class="{ curr: filter_status[index] }">
<text class="text">{{ item }}</text>
<view class="check-ico" @click="filterChange(index)"></view>
</view>
</view>
<view class="btn row rowCenter verCenter" @click="submit()">确认拆分</view>
<view class="pop-btn row rowCenter verCenter" @click="confirmChange">确 认</view>
</view>
</uni-popup>
</view>
</template>
<script>
import { API } from '@/util/api.js';
import { createArray } from '@/util/util.js';
export default {
data() {
return {
goods_list_index: -1,
goods_list: ['1-2328702-0', '1-2328701']
curr: -1, //当前打开的是哪个产地
erp_order_sn: '',
goods_index: -1,
goods_list: [],
num_arr: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
index: -1,
filter_status: [], //控制状态
origin_list: [], //产地
origin: '', //搜索国家携带的参数
tally_num: 0, //拆分数量
detail_json: [], //收集的数据
dataStates: {} // 用于记录数据状态的对象
};
},
onLoad(options) {},
onLoad(options) {
this.erp_order_sn = options.erp_order_sn || '';
// 从本地缓存中获取数据
const dataFromSourcePage = uni.getStorageSync('paramsOrigin');
// 使用Object.assign()将dataFromSourcePage的属性合并到data中
Object.assign(this.$data, dataFromSourcePage);
},
onShow() {
this.getData();
this.getOrigin();
},
methods: {
bindPickerChange: function(e) {
open(index) {
this.curr = index;
this.filter_status.fill(false);
this.$refs.popup.open('bottom');
},
/**
* 找出false对应的下标
* @param {Object} arr
* @param {Object} target
*/
findIndex(arr, target) {
const result = [];
arr.map((item, index) => {
if (item === target) {
result.push(index);
}
});
return result;
},
onInput() {
// 清除之前的定时器
clearTimeout(this.timer);
this.timer = setTimeout(() => {
this.origin_list = []; //数组清空
this.getOrigin();
}, 800);
},
bindPickerChange: function(e, type) {
console.log('picker发送选择改变，携带值为', e.target.value);
if (type == 1) {
this.goods_index = e.target.value;
} else if (type == 2) {
this.tally_num = parseInt(e.target.value) + 1;
this.index = e.target.value;
this.form.logistics_company = this.array[e.target.value];
this.detail_json = Array.from({ length: this.tally_num }, () => ({ origin: '', tally_num: '', ptEntryID: this.goods_list[this.goods_index].ptEntryID }));
}
},
getOrigin() {
this.request(API.getOrigin, 'GET', { origin: this.origin }, true).then(res => {
if (res.err_code === 0) {
this.origin_list = Object.values(res.data);
this.filter_status = createArray(this.origin_list.length, false);
} else {
uni.showToast({
title: res.err_msg,
icon: 'error'
});
}
});
},
getData() {
this.request(API.getCheckInList, 'POST', { number: this.id }, this.loading).then(res => {
this.request(API.getTallyGoods, 'GET', { erp_order_sn: this.erp_order_sn }, true).then(res => {
if (res.err_code === 0) {
this.form.checkIn = res.data[0];
if (res.data.entrys.length > 0) {
this.goods_list = res.data.entrys;
}
} else {
uni.showToast({
title: res.err_msg,
......@@ -108,7 +184,87 @@ export default {
}
});
},
submit() {}
/**
*筛选过滤出选中的元素
*/
filterChange(index) {
this.$set(this.filter_status, index, (this.filter_status[index] = !this.filter_status[index]));
let filter_arr = this.findIndex(this.filter_status, true);
var name = filter_arr.map(i => this.origin_list[i]);
this.detail_json[this.curr].origin = name[0];
this.$forceUpdate();
this.$refs.popup.close();
},
confirmChange() {
this.$refs.popup.close();
},
/**
* 判断是否有重复的产地
*/
hasDuplicateOrigin(arr) {
const uniqueOrigins = new Set();
for (const item of arr) {
if (uniqueOrigins.has(item.origin)) {
return true;
}
uniqueOrigins.add(item.origin);
}
return false;
},
submit() {
if (this.goods_index == -1) {
uni.showToast({
title: '请选择型号',
icon: 'none'
});
return false;
}
if (this.tally_num == 0) {
uni.showToast({
title: '请选择拆分数量',
icon: 'none'
});
return false;
}
const shouldContinue = !this.detail_json.some(item => {
if (!item.origin) {
uni.showToast({
title: '请选择拆分国家',
icon: 'none'
});
return true;
}
return false;
});
const hasDuplicates = this.hasDuplicateOrigin(this.detail_json);
if (hasDuplicates) {
uni.showToast({
title: '不允许有相同产地，请重新选择产地',
icon: 'none'
});
return false;
}
if (shouldContinue) {
const totalTallyNum = this.detail_json.reduce((total, item) => total + parseInt(item.tally_num), 0);
const total = this.goods_list[this.goods_index].qty * 1;
if (totalTallyNum != total) {
uni.showModal({
title: '错误提示',
content: '拆分数量总和必须等于订单数量（不可大于或者小于）',
showCancel: false
});
return false;
}
}
uni.$emit('updateOriginData', this.$data);
uni.navigateBack({
delta: 1
});
}
}
};
</script>
......
uni_modules/uni-popup/components/uni-popup/uni-popup.vue
<template>
<view v-if="showPopup" class="uni-popup" :class="[popupstyle, isDesktop ? 'fixforpc-z-index' : '']">
<view @touchstart="touchstart">
<uni-transition key="1" v-if="maskShow" name="mask" mode-class="fade" :styles="maskClass"
:duration="duration" :show="showTrans" @click="onTap" />
<uni-transition key="2" :mode-class="ani" name="content" :styles="transClass" :duration="duration"
:show="showTrans" @click="onTap">
<view class="uni-popup__wrapper" :style="{ backgroundColor: bg }" :class="[popupstyle]" @click="clear">
<slot />
</view>
<uni-transition key="1" v-if="maskShow" name="mask" mode-class="fade" :styles="maskClass" :duration="duration" :show="showTrans" @click="onTap" />
<uni-transition key="2" :mode-class="ani" name="content" :styles="transClass" :duration="duration" :show="showTrans" @click="onTap">
<view class="uni-popup__wrapper" :style="{ backgroundColor: bg }" :class="[popupstyle]" @click="clear"><slot /></view>
</uni-transition>
</view>
<!-- #ifdef H5 -->
......@@ -17,11 +13,11 @@
</template>
<script>
// #ifdef H5
import keypress from './keypress.js'
// #endif
// #ifdef H5
import keypress from './keypress.js';
// #endif
/**
/**
* PopUp 弹出层
* @description 弹出层组件，为了解决遮罩弹层的问题
* @tutorial https://ext.dcloud.net.cn/plugin?id=329
......@@ -44,7 +40,7 @@
* @event {Function} maskClick 点击遮罩触发
*/
export default {
export default {
name: 'uniPopup',
components: {
// #ifdef H5
......@@ -85,7 +81,7 @@
maskBackgroundColor: {
type: String,
default: 'rgba(0, 0, 0, 0.4)'
},
}
},
watch: {
......@@ -94,15 +90,15 @@
*/
type: {
handler: function(type) {
if (!this.config[type]) return
this[this.config[type]](true)
if (!this.config[type]) return;
this[this.config[type]](true);
},
immediate: true
},
isDesktop: {
handler: function(newVal) {
if (!this.config[newVal]) return
this[this.config[this.type]](true)
if (!this.config[newVal]) return;
this[this.config[this.type]](true);
},
immediate: true
},
......@@ -112,13 +108,13 @@
*/
maskClick: {
handler: function(val) {
this.mkclick = val
this.mkclick = val;
},
immediate: true
},
isMaskClick: {
handler: function(val) {
this.mkclick = val
this.mkclick = val;
},
immediate: true
},
......@@ -126,7 +122,7 @@
showPopup(show) {
// #ifdef H5
// fix by mehaotian 处理 h5 滚动穿透的问题
document.getElementsByTagName('body')[0].style.overflow = show ? 'hidden' : 'visible'
document.getElementsByTagName('body')[0].style.overflow = show ? 'hidden' : 'visible';
// #endif
}
},
......@@ -164,44 +160,37 @@
maskShow: true,
mkclick: true,
popupstyle: this.isDesktop ? 'fixforpc-top' : 'top'
}
};
},
computed: {
isDesktop() {
return this.popupWidth >= 500 && this.popupHeight >= 500
return this.popupWidth >= 500 && this.popupHeight >= 500;
},
bg() {
if (this.backgroundColor === '' || this.backgroundColor === 'none') {
return 'transparent'
return 'transparent';
}
return this.backgroundColor
return this.backgroundColor;
}
},
mounted() {
const fixSize = () => {
const {
windowWidth,
windowHeight,
windowTop,
safeArea,
screenHeight,
safeAreaInsets
} = uni.getSystemInfoSync()
this.popupWidth = windowWidth
this.popupHeight = windowHeight + (windowTop || 0)
const { windowWidth, windowHeight, windowTop, safeArea, screenHeight, safeAreaInsets } = uni.getSystemInfoSync();
this.popupWidth = windowWidth;
this.popupHeight = windowHeight + (windowTop || 0);
// TODO fix by mehaotian 是否适配底部安全区 ,目前微信ios 、和 app ios 计算有差异，需要框架修复
if (safeArea && this.safeArea) {
// #ifdef MP-WEIXIN
this.safeAreaInsets = screenHeight - safeArea.bottom
this.safeAreaInsets = screenHeight - safeArea.bottom;
// #endif
// #ifndef MP-WEIXIN
this.safeAreaInsets = safeAreaInsets.bottom
this.safeAreaInsets = safeAreaInsets.bottom;
// #endif
} else {
this.safeAreaInsets = 0
}
this.safeAreaInsets = 0;
}
fixSize()
};
fixSize();
// #ifdef H5
// window.addEventListener('resize', fixSize)
// this.$once('hook:beforeDestroy', () => {
......@@ -212,155 +201,156 @@
// #ifndef VUE3
// TODO vue2
destroyed() {
this.setH5Visible()
this.setH5Visible();
},
// #endif
// #ifdef VUE3
// TODO vue3
unmounted() {
this.setH5Visible()
this.setH5Visible();
},
// #endif
created() {
// this.mkclick = this.isMaskClick || this.maskClick
if (this.isMaskClick === null && this.maskClick === null) {
this.mkclick = true
this.mkclick = true;
} else {
this.mkclick = this.isMaskClick !== null ? this.isMaskClick : this.maskClick
this.mkclick = this.isMaskClick !== null ? this.isMaskClick : this.maskClick;
}
if (this.animation) {
this.duration = 300
this.duration = 300;
} else {
this.duration = 0
this.duration = 0;
}
// TODO 处理 message 组件生命周期异常的问题
this.messageChild = null
this.messageChild = null;
// TODO 解决头条冒泡的问题
this.clearPropagation = false
this.maskClass.backgroundColor = this.maskBackgroundColor
this.clearPropagation = false;
this.maskClass.backgroundColor = this.maskBackgroundColor;
},
methods: {
setH5Visible() {
// #ifdef H5
// fix by mehaotian 处理 h5 滚动穿透的问题
document.getElementsByTagName('body')[0].style.overflow = 'visible'
document.getElementsByTagName('body')[0].style.overflow = 'visible';
// #endif
},
/**
* 公用方法，不显示遮罩层
*/
closeMask() {
this.maskShow = false
this.maskShow = false;
},
/**
* 公用方法，遮罩层禁止点击
*/
disableMask() {
this.mkclick = false
this.mkclick = false;
},
// TODO nvue 取消冒泡
clear(e) {
// #ifndef APP-NVUE
e.stopPropagation()
e.stopPropagation();
// #endif
this.clearPropagation = true
this.clearPropagation = true;
},
open(direction) {
// fix by mehaotian 处理快速打开关闭的情况
if (this.showPopup) {
clearTimeout(this.timer)
this.showPopup = false
clearTimeout(this.timer);
this.showPopup = false;
}
let innerType = ['top', 'center', 'bottom', 'left', 'right', 'message', 'dialog', 'share']
let innerType = ['top', 'center', 'bottom', 'left', 'right', 'message', 'dialog', 'share'];
if (!(direction && innerType.indexOf(direction) !== -1)) {
direction = this.type
direction = this.type;
}
if (!this.config[direction]) {
console.error('缺少类型：', direction)
return
console.error('缺少类型：', direction);
return;
}
this[this.config[direction]]()
this[this.config[direction]]();
this.$emit('change', {
show: true,
type: direction
})
});
},
close(type) {
this.showTrans = false
this.showTrans = false;
this.$emit('change', {
show: false,
type: this.type
})
clearTimeout(this.timer)
});
clearTimeout(this.timer);
// // 自定义关闭事件
// this.customOpen && this.customClose()
this.timer = setTimeout(() => {
this.showPopup = false
}, 300)
this.showPopup = false;
}, 300);
},
// TODO 处理冒泡事件，头条的冒泡事件有问题 ，先这样兼容
touchstart() {
this.clearPropagation = false
this.clearPropagation = false;
},
onTap() {
if (this.clearPropagation) {
// fix by mehaotian 兼容 nvue
this.clearPropagation = false
return
this.clearPropagation = false;
return;
}
this.$emit('maskClick')
if (!this.mkclick) return
this.close()
this.$emit('maskClick');
if (!this.mkclick) return;
this.close();
},
/**
* 顶部弹出样式处理
*/
top(type) {
this.popupstyle = this.isDesktop ? 'fixforpc-top' : 'top'
this.ani = ['slide-top']
this.popupstyle = this.isDesktop ? 'fixforpc-top' : 'top';
this.ani = ['slide-top'];
this.transClass = {
position: 'fixed',
left: 0,
right: 0,
backgroundColor: this.bg
}
};
// TODO 兼容 type 属性 ，后续会废弃
if (type) return
this.showPopup = true
this.showTrans = true
if (type) return;
this.showPopup = true;
this.showTrans = true;
this.$nextTick(() => {
if (this.messageChild && this.type === 'message') {
this.messageChild.timerClose()
this.messageChild.timerClose();
}
})
});
},
/**
* 底部弹出样式处理
*/
bottom(type) {
this.popupstyle = 'bottom'
this.ani = ['slide-bottom']
this.popupstyle = 'bottom';
this.ani = ['slide-bottom'];
this.transClass = {
position: 'fixed',
left: 0,
right: 0,
bottom: 0,
paddingBottom: this.safeAreaInsets + 'px',
backgroundColor: this.bg
}
backgroundColor: this.bg,
borderRadius: '20rpx'
};
// TODO 兼容 type 属性 ，后续会废弃
if (type) return
this.showPopup = true
this.showTrans = true
if (type) return;
this.showPopup = true;
this.showTrans = true;
},
/**
* 中间弹出样式处理
*/
center(type) {
this.popupstyle = 'center'
this.ani = ['zoom-out', 'fade']
this.popupstyle = 'center';
this.ani = ['zoom-out', 'fade'];
this.transClass = {
position: 'fixed',
/* #ifndef APP-NVUE */
......@@ -373,15 +363,15 @@
top: 0,
justifyContent: 'center',
alignItems: 'center'
}
};
// TODO 兼容 type 属性 ，后续会废弃
if (type) return
this.showPopup = true
this.showTrans = true
if (type) return;
this.showPopup = true;
this.showTrans = true;
},
left(type) {
this.popupstyle = 'left'
this.ani = ['slide-left']
this.popupstyle = 'left';
this.ani = ['slide-left'];
this.transClass = {
position: 'fixed',
left: 0,
......@@ -392,15 +382,15 @@
display: 'flex',
flexDirection: 'column'
/* #endif */
}
};
// TODO 兼容 type 属性 ，后续会废弃
if (type) return
this.showPopup = true
this.showTrans = true
if (type) return;
this.showPopup = true;
this.showTrans = true;
},
right(type) {
this.popupstyle = 'right'
this.ani = ['slide-right']
this.popupstyle = 'right';
this.ani = ['slide-right'];
this.transClass = {
position: 'fixed',
bottom: 0,
......@@ -411,17 +401,17 @@
display: 'flex',
flexDirection: 'column'
/* #endif */
}
};
// TODO 兼容 type 属性 ，后续会废弃
if (type) return
this.showPopup = true
this.showTrans = true
}
if (type) return;
this.showPopup = true;
this.showTrans = true;
}
}
};
</script>
<style lang="scss">
.uni-popup {
.uni-popup {
position: fixed;
/* #ifndef APP-NVUE */
z-index: 99;
......@@ -439,6 +429,7 @@
}
.uni-popup__wrapper {
border-radius: 20rpx 20rpx 0rpx 0rpx;
/* #ifndef APP-NVUE */
display: block;
/* #endif */
......@@ -460,15 +451,15 @@
flex: 1;
}
}
}
}
.fixforpc-z-index {
.fixforpc-z-index {
/* #ifndef APP-NVUE */
z-index: 999;
/* #endif */
}
}
.fixforpc-top {
.fixforpc-top {
top: 0;
}
}
</style>
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 = 'http://api.liexin.com';
const API_BASE_OSS = 'http://image.liexindev.net'; //oss系统
const API = {
/**
* 上传数据
......@@ -26,6 +30,10 @@ const API = {
* */
upload: API_BASE + '/oss/upload',
/**
* 上传文件
* */
uploadImage: API_BASE_OSS + '/uploadImage',
/**
* 生成打印标签数据
* */
printLabel: API_BASE + '/supplywechatwms/printLabel',
......@@ -160,7 +168,32 @@ const API = {
/**
* 提交当前箱号的数据
*/
submitBoxSnAndNum: API_BASE + '/supplywechatwms/submitBoxSnAndNum'
submitBoxSnAndNum: API_BASE + '/supplywechatwms/submitBoxSnAndNum',
/**
* 获取入仓号的理货数据
*/
getTallyGoods: API_BASE + '/supplywechatwms/getTallyGoods',
/**
* 检测入仓号是否理货
*/
checkErpOrderSnIsTally: API_BASE + '/supplywechatwms/checkErpOrderSnIsTally',
/**
* 获取产地
*/
getOrigin: API_BASE + '/supplywechatwms/getOrigin',
/**
* 获取合箱子入仓号
*/
getFixErpOrderSn: API_BASE + '/supplywechatwms/getFixErpOrderSn',
/**
* 修改是否查看
*/
changeWatch: API_BASE + '/supplywechatwms/changeWatch',
/**
* 提交理货
*/
submitTallyGoods: API_BASE + '/supplywechatwms/submitTallyGoods'
}
......
util/util.js
import API_BASE from '../util/api.js'
/**
* 请求封装
*/
......@@ -88,9 +87,18 @@ const debounce = (fn, wait) => {
}
/**
* 来创建指定长度且所有元素都被初始化为 false 的数组
*/
const createArray = (length, value) => {
return Array(length).fill(value);
}
module.exports = {
request,
getPlatform,
titleCase,
debounce
debounce,
createArray
}
\ No newline at end of file
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