Commit 0610c731 by LJM

bug

parent 490ad412
......@@ -102,21 +102,45 @@
color: #484b59;
}
}
.btn2 {
.wrap {
width: calc(100% - 128rpx);
.print_type {
width: 50%;
height: 75rpx;
background: #1969f9;
border-right: 1px solid #ffffff;
.t1 {
font-size: 23rpx;
color: #ffffff;
}
}
.print-type-box {
width: 50%;
height: 75rpx;
background: #1969f9;
picker {
width: 100%;
height: 100%;
}
.uni-input {
font-size: 23rpx;
color: #ffffff;
}
}
}
.btn2 {
width: 50%;
height: 75rpx;
background: #1969f9;
font-size: 23rpx;
color: #ffffff;
}
.btn3 {
width: 180rpx;
width: calc(100% - 128rpx);
height: 75rpx;
background: #ffffff;
background: #1969f9;
font-size: 23rpx;
color: #ff3700;
border-left: 1px solid #f0f0f2;
font-weight: bold;
color: #ffffff;
}
}
.list {
......@@ -411,21 +435,27 @@
}
.print {
margin-bottom: 27rpx;
.check-box-icon {
width: 20rpx;
height: 20rpx;
background: url('https://img.ichunt.com/images/ichunt/202304/11/0bf30da3e8ce6c476c210173b5f13d51.png') no-repeat center;
background-size: contain;
display: block;
&.curr {
background: url('https://img.ichunt.com/images/ichunt/202304/11/71a74e52e94bcf2e89f8df9817d494c6.png') no-repeat center;
background-size: contain;
}
width: 50%;
height: 38rpx;
.t1 {
font-size: 20rpx;
color: #1969f9;
font-weight: bold;
}
.tt {
font-size: 17rpx;
color: #484b59;
margin-left: 10rpx;
.print-type-box {
picker {
.uni-input {
font-size: 17rpx;
color: #484b59;
}
.uni-arrow {
width: 14rpx;
height: 9rpx;
background: url('https://img.ichunt.com/images/ichunt/202304/10/e4c72319ad41ce1425f71cc6ec35f111.png') no-repeat center;
background-size: contain;
margin-left: 12rpx;
}
}
}
}
.btn {
......
......@@ -42,6 +42,10 @@
</view>
<view class="list row bothSide" v-if="list.length > 0">
<view class="box box-width" v-for="(item, index) in list" :key="index">
<view class="text-item row verCenter" v-if="item.sku_id">
<text class="label">自营货品ID:</text>
<text class="t1">{{ item.sku_id }}</text>
</view>
<view class="text-item row verCenter">
<text class="label">入库批次号:</text>
<text class="t1">{{ item.stock_in_batch_sn }}</text>
......@@ -132,6 +136,10 @@
<text class="label">货品编码:</text>
<text class="tt" style="max-width: 100%;">{{ detail.goods_sn }}</text>
</view>
<view class="item row verCenter" style="flex: 0 0 100%;" v-if="detail.sku_id > 0">
<text class="label">自营货品ID:</text>
<text class="tt" style="max-width: 100%;">{{ detail.sku_id }}</text>
</view>
<view class="item row verCenter" style="flex: 0 0 100%;">
<text class="label">货品名称:</text>
<text class="tt" style="max-width: 100%;">{{ detail.goods_name }}</text>
......
......@@ -45,7 +45,7 @@
<text class="label">总 数 量:</text>
<text class="tt">{{ item.total_qty }}</text>
</view>
<view class="btn-box row"><navigator :url="'/pages/stockRecheck/sort?stock_out_id=' + item.stock_out_id + '&stock_out_sn=' + item.stock_out_sn" class="btn1 row rowCenter verCenter" hover-class="none">选择</navigator></view>
<view class="btn-box row"><navigator :url="'/pages/stockRecheck/sort?stock_out_id=' + item.stock_out_id + '&stock_out_sn=' + item.stock_out_sn + '&warehouse_id=' + item.warehouse_id" class="btn1 row rowCenter verCenter" hover-class="none">选择</navigator></view>
</view>
</view>
<!-- 无数据展示 -->
......
......@@ -32,6 +32,10 @@
<text class="label">货品编码:</text>
<text class="text">{{ item.goods_sn }}</text>
</view>
<view class="input-box row verCenter" v-if="item.sku_id">
<text class="label">自营货品ID:</text>
<text class="text">{{ item.sku_id }}</text>
</view>
<view class="input-box row verCenter">
<text class="label">货品名称:</text>
<text class="text">{{ item.goods_name }}</text>
......
......@@ -73,6 +73,10 @@
<text class="label">货品编码:</text>
<text class="text">{{ item.goods_sn }}</text>
</view>
<view class="input-box row verCenter" v-if="item.sku_id > 0">
<text class="label">自营货品ID:</text>
<text class="text">{{ item.sku_id }}</text>
</view>
<view class="input-box row verCenter">
<text class="label">货品名称:</text>
<text class="text">{{ item.goods_name }}</text>
......@@ -171,7 +175,22 @@
<text class="check-box-icon" :class="{ curr: filter_list.length > 0 && filter_list.length == filter_id.length }"></text>
<text class="text">{{ filter_id.length == 0 ? '全选' : filter_id.length }}</text>
</view>
<view class="btn2 row rowCenter verCenter" @click="showDrawer(0)">一键复核</view>
<template v-if="warehouse_id == 9">
<view class="row rowCenter verCenter wrap">
<view class="print_type row rowCenter verCenter">
<text class="t1" @click="rePrintTag()">打印货品标签</text>
<view class="print-type-box row rowCenter verCenter">
<picker @change="bindPickerChange" :value="print_style_index" :range="print_style" class="row rowCenter verCenter">
<view class="uni-input">{{ print_style[print_style_index] }}</view>
</picker>
</view>
</view>
<view class="btn2 row rowCenter verCenter" @click="showDrawer(0)">一键复核</view>
</view>
</template>
<template v-else>
<view class="btn3 row rowCenter verCenter" @click="showDrawer(0)">一键复核</view>
</template>
</view>
<!-- 按货品复核-弹窗 -->
<uni-drawer ref="showRight" mode="right">
......@@ -204,15 +223,19 @@
<view class="bor"></view>
<view class="item-tit">货品详情</view>
<view class="field-item row">
<view class="item row verCenter" style="flex: 0 0 100%;">
<view class="item row verCenter">
<text class="label">货品编码:</text>
<text class="tt" style="max-width: 100%;">{{ detail.goods_sn }}</text>
</view>
<view class="item row verCenter" style="flex: 0 0 100%;">
<view class="item row verCenter" v-if="detail.sku_id">
<text class="label">自营货品ID:</text>
<text class="tt" style="max-width: 100%;">{{ detail.sku_id }}</text>
</view>
<view class="item row verCenter">
<text class="label">货品名称:</text>
<text class="tt" style="max-width: 100%;">{{ detail.goods_name }}</text>
</view>
<view class="item row verCenter" style="flex: 0 0 100%;">
<view class="item row verCenter">
<text class="label">标准品牌:</text>
<text class="tt" style="max-width: 100%;">{{ detail.brand_name }}</text>
</view>
......@@ -232,14 +255,34 @@
<text class="label">入 仓 号:</text>
<text class="tt">{{ detail.inhouse }}</text>
</view>
<view class="item row verCenter" style="flex: 0 0 100%;">
<view class="item row verCenter">
<text class="label">其他批次属性:</text>
<text class="tt">{{ detail.other_batch_attr }}</text>
</view>
<view class="item row verCenter" style="flex: 0 0 100%;margin-bottom: 17rpx;" v-if="detail.customer_material_number">
<view class="item row verCenter" v-if="detail.customer_material_number">
<text class="label">客户物料编码:</text>
<text class="tt">{{ detail.customer_material_number }}</text>
</view>
<view class="item row verCenter" style="flex: 0 0 100%;">
<text class="label">主单仓库备注:</text>
<text class="tt">{{ detail.upstream_remarks }}</text>
</view>
<view class="item row verCenter" style="flex: 0 0 100%;">
<text class="label">仓库备注:</text>
<text class="tt">{{ detail.remark }}</text>
</view>
<view class="item row verCenter">
<text class="label">包装方式:</text>
<text class="tt">{{ detail.packing_val }}</text>
</view>
<view class="item row verCenter">
<text class="label">标准包装量:</text>
<text class="tt">{{ detail.mpq }}</text>
</view>
<view class="item row verCenter">
<text class="label">单位:</text>
<text class="tt">{{ detail.goods_unit }}</text>
</view>
</view>
<view class="bor"></view>
<view class="field-item row">
......@@ -290,10 +333,17 @@
<view class="default row rowCenter verCenter" @click="chooseImageChange()" v-if="image_list.length < maxNum"><text class="iconfont icon-a-juxing3"></text></view>
</view>
<view class="bor"></view>
<!-- <view class="print row verCenter">
<text class="check-box-icon curr"></text>
<text class="tt">打印客户专属标签</text>
</view> -->
<view class="print row verCenter bothSide" v-if="warehouse_id == 9">
<text class="t1" @click="rePrintTag(1)">打印货品标签</text>
<view class="print-type-box row rowCenter verCenter">
<picker @change="bindPickerChange" :value="print_style_index" :range="print_style" class="row rowCenter verCenter">
<view class="row rowCenter verCenter">
<view class="uni-input">{{ print_style[print_style_index] }}</view>
<view class="uni-arrow"></view>
</view>
</picker>
</view>
</view>
<view class="btn row verCenter bothSide">
<view class="btn0 row rowCenter verCenter" @click="closeDrawer(1)">取 消</view>
<view class="btn1 row rowCenter verCenter" style="width: 50%;" @click="markChecked(detail.stock_out_item_id, formParams.recheck_qty, searchParams.box_name)">复 核</view>
......@@ -381,6 +431,10 @@
<text class="label">货品编码:</text>
<text class="text">{{ item.goods_sn }}</text>
</view>
<view class="input-box row verCenter" v-if="item.sku_id > 0">
<text class="label">自营货品ID:</text>
<text class="text">{{ item.sku_id }}</text>
</view>
<view class="input-box row verCenter">
<text class="label">货品名称:</text>
<text class="text">{{ item.goods_name }}</text>
......@@ -576,8 +630,11 @@ export default {
limit: 1000,
curr: 0,
index: -1,
warehouse_id: '', //仓库id
array: ['深圳市猎芯科技有限公司', '深贸电子有限公司'],
itemArr: ['按货品复核', '按容器复核'],
print_style: ['基本样式', '不带D/C'],
print_style_index: 0,
list: [],
filter_list: [], //筛选已选中的列表
filter_id: [], //过滤处理的id
......@@ -596,6 +653,11 @@ export default {
},
formParams: {
recheck_qty: ''
},
rePrintTagParams: {
stock_out_item_id: '',
print_type: 0,
recheck_num: ''
}
};
},
......@@ -608,6 +670,7 @@ export default {
},
onLoad(options) {
this.searchParams.stock_out_id = options.stock_out_id || '';
this.warehouse_id = options.warehouse_id || '';
this.stock_out_sn = options.stock_out_sn || '';
},
onShow() {
......@@ -640,6 +703,15 @@ export default {
this.getData();
},
/**
* 打印货品标签样式切换监听
* @param {Object} e
*/
bindPickerChange: function(e) {
this.print_style_index = e.detail.value;
this.rePrintTagParams.print_type = e.detail.value;
},
bindPickerBoxChange: function(e, index) {
console.log('picker发送选择改变,携带值为', e.detail.value);
this.index = e.detail.value;
......@@ -711,6 +783,38 @@ export default {
}
},
/**
*打印货品标签
*/
rePrintTag(type) {
if (type == 1) {
this.rePrintTagParams.stock_out_item_id = this.detail.stock_out_item_id;
this.rePrintTagParams.recheck_num = this.formParams.recheck_qty;
} else {
if (this.filter_id.length == 0) {
uni.showToast({
title: '请勾选数据',
icon: 'error'
});
return false;
}
this.rePrintTagParams.stock_out_item_id = this.filter_id.join(','); //出库明细ids
}
this.request(API.RePrintTag, 'POST', this.rePrintTagParams, true).then(res => {
if (res.code === 0) {
uni.showToast({
title: '操作成功',
icon: 'success'
});
} else {
uni.showToast({
title: res.msg,
icon: 'none'
});
}
});
},
/**
* 选择图片
*/
chooseImageChange() {
......
......@@ -268,6 +268,10 @@ const API = {
* */
getPackList: API_BASE + '/api/stockRecheck/getPackList',
/**
* 打印货品标签
* */
RePrintTag: API_BASE + '/api/stockRecheck/RePrintTag',
/**
* 箱配置信息
* */
getBoxConfigList: API_BASE + '/api/stockRecheck/getBoxConfigList',
......
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