Commit e2102540 by LJM

二期

parent 5bdd5344
......@@ -16,6 +16,23 @@
color: #292b33;
font-weight: bold;
}
.pick-box {
width: 164rpx;
height: 35rpx;
padding-left: 17rpx;
.uni-input {
font-size: 18rpx;
color: #292b33;
font-weight: bold;
}
.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;
}
}
.input-wrap {
padding-left: 17rpx;
padding-right: 18rpx;
......
......@@ -150,8 +150,15 @@
.item-tit {
font-size: 20rpx;
color: #292b33;
font-weight: bold;
margin-bottom: 18rpx;
transition: all 0.2s ease;
text:first-child {
margin-right: 32rpx;
}
.curr {
color: #1969f9;
font-weight: bold;
}
}
.h2 {
font-size: 17rpx;
......
......@@ -285,6 +285,11 @@
"navigationBarTitleText": "移位"
}
}, {
"path": "pages/transfer/quick",
"style": {
"navigationBarTitleText": "快速移位"
}
}, {
"path": "pages/transfer/task",
"style": {
"navigationBarTitleText": "移位任务"
......
<template>
<view class="immediatelyStockIn">
<view class="form-input row verCenter">
<text class="text row verCenter">货品编码</text>
<text class="text row verCenter">入库批次号</text>
<view class="row bothSide verCenter input-wrap">
<input type="text" placeholder="请输入入库批次号" placeholder-style="color:#919399" class="uni-input" v-model="formParams.stock_in_batch_sn" @input="handleInput(4, $event)" />
<text class="iconfont icon-a-juxing11" @click="clearInput(4)" v-if="input_stock_in_batch_sn"></text>
</view>
</view>
<view class="form-input row verCenter">
<view class="pick-box">
<picker @change="bindPickerChange($event, 1)" :value="index" :range="item">
<view class="row verCenter">
<view class="uni-input">{{ item[index] }}</view>
<view class="uni-arrow"></view>
</view>
</picker>
</view>
<view class="row bothSide verCenter input-wrap">
<template v-if="index == 0">
<input type="text" placeholder="请输入货品编码" placeholder-style="color:#919399" class="uni-input" v-model="formParams.goods_sn" @input="handleInput(1, $event)" />
</template>
<template v-else-if="index == 1">
<input type="text" placeholder="请输入自营货品ID" placeholder-style="color:#919399" class="uni-input" v-model="formParams.sku_id" @input="handleInput(1, $event)" />
</template>
<text class="iconfont icon-a-juxing11" @click="clearInput(1)" v-if="input_goods_sn"></text>
</view>
</view>
......@@ -45,6 +64,8 @@ export default {
return {
is_submit: true,
index: 0,
item: ['货品编码', '自营货品ID'],
input_stock_in_batch_sn: false,
input_goods_sn: false,
input_goods_name: false,
input_position: false,
......@@ -52,6 +73,8 @@ export default {
position_id_index: 0,
warehouse_id_data: [],
formParams: {
stock_in_batch_sn: '',
sku_id: '',
goods_sn: '',
goods_name: '',
warehouse_id: '',
......@@ -63,9 +86,18 @@ export default {
this.getData();
},
methods: {
bindPickerChange: function(e) {
bindPickerChange: function(e, type) {
if (type == 1) {
this.index = e.detail.value;
if (this.index == 0) {
this.formParams.sku_id = '';
} else if (this.index == 1) {
this.formParams.goods_sn = '';
}
} else {
this.warehouse_id_index = e.detail.value;
this.formParams.warehouse_id = this.warehouse_id_data[e.detail.value].value;
}
console.log('picker发送选择改变,携带值为', e.detail.value);
},
/**
......@@ -73,7 +105,11 @@ export default {
*/
clearInput(type) {
if (type == 1) {
if (this.index == 0) {
this.formParams.goods_sn = '';
} else if (this.index == 1) {
this.formParams.sku_id = '';
}
this.input_goods_sn = false;
} else if (type == 2) {
this.formParams.goods_name = '';
......@@ -81,6 +117,9 @@ export default {
} else if (type == 3) {
this.formParams.position_code = '';
this.input_position = false;
} else if (type == 4) {
this.formParams.stock_in_batch_sn = '';
this.input_stock_in_batch_sn = false;
}
},
/**
......@@ -96,6 +135,8 @@ export default {
} else if (type == 3) {
this.input_position = true;
this.getWhPositionList(this.formParams.warehouse_id, 0);
} else if (type == 4) {
this.input_stock_in_batch_sn = true;
}
} else {
if (type == 1) {
......@@ -104,6 +145,8 @@ export default {
this.input_goods_name = false;
} else if (type == 3) {
this.input_position = false;
} else if (type == 4) {
this.input_stock_in_batch_sn = false;
}
}
}, 500),
......@@ -155,7 +198,7 @@ export default {
return false;
}
uni.navigateTo({
url: '/pages/immediatelyStockIn/list?goods_sn=' + this.formParams.goods_sn + '&goods_name=' + this.formParams.goods_name + '&warehouse_id=' + this.formParams.warehouse_id + '&position_id=' + this.formParams.position_id
url: '/pages/immediatelyStockIn/list?goods_sn=' + this.formParams.goods_sn + '&goods_name=' + this.formParams.goods_name + '&warehouse_id=' + this.formParams.warehouse_id + '&position_id=' + this.formParams.position_id + '&sku_id=' + this.formParams.sku_id + '&stock_in_batch_sn=' + this.formParams.stock_in_batch_sn
});
}
}
......
......@@ -31,7 +31,7 @@
</view>
<view class="input-box row verCenter">
<text class="label">入 仓 号:</text>
<text class="text">--</text>
<text class="text">{{ item.position_name }}</text>
</view>
<view class="input-box row verCenter">
<text class="label">识 别 码:</text>
......@@ -41,6 +41,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>
......@@ -61,7 +65,7 @@
<text class="label">货品品质:</text>
<text class="text">{{ item.quality_format }}</text>
</view>
<view class="input-box row verCenter" style="flex: 0 0 100%;">
<view class="input-box row verCenter">
<text class="label">其他批次属性:</text>
<text class="text">{{ item.other_batch_attr }}</text>
</view>
......@@ -97,7 +101,9 @@ export default {
goods_sn: '',
goods_name: '',
warehouse_id: '',
position_code: ''
position_code: '',
stock_in_batch_sn: '',
sku_id: ''
}
};
},
......@@ -113,6 +119,8 @@ export default {
this.formParams.goods_name = options.goods_name || '';
this.formParams.warehouse_id = options.warehouse_id || '';
this.formParams.position_code = options.position_code || '';
this.formParams.stock_in_batch_sn = options.stock_in_batch_sn || '';
this.formParams.sku_id = options.sku_id || '';
},
onShow() {
this.getData();
......
......@@ -46,6 +46,10 @@
<view class="box row rowCenter verCenter"><image src="/static/home/@2x(3).png"></image></view>
<text class="text">移位</text>
</navigator>
<navigator class="box-li column rowCenter verCenter" url="/pages/transfer/quick" hover-class="none">
<view class="box row rowCenter verCenter"><image src="/static/home/@2x(3).png"></image></view>
<text class="text">快速移位</text>
</navigator>
<navigator class="box-li column rowCenter verCenter" url="/pages/stocktake/list" hover-class="none">
<view class="box row rowCenter verCenter"><image src="/static/home/@2x(10).png"></image></view>
<text class="text">盘点</text>
......
......@@ -50,6 +50,10 @@
<text class="t1">{{ item.warehouse_name }}</text>
</view>
<view class="bor row"></view>
<view class="text-item row verCenter" v-if="item.sku_id > 0">
<text class="label" style="width: 100rpx;">自营货品ID:</text>
<text class="tt">{{ item.sku_id }}</text>
</view>
<view class="text-item row verCenter">
<text class="label">货品名称:</text>
<text class="tt">{{ item.goods_name }}</text>
......
......@@ -67,6 +67,10 @@
<text class="t1">{{ item.inhouse }}</text>
</view>
<view class="bor row"></view>
<view class="text-item row verCenter" v-if="item.sku_id > 0">
<text class="label" style="width: 100rpx;">自营货品ID:</text>
<text class="tt">{{ item.sku_id }}</text>
</view>
<view class="text-item row verCenter">
<text class="label">货品名称:</text>
<text class="tt">{{ item.goods_name }}</text>
......@@ -152,8 +156,12 @@
<text class="tt" style="max-width: 100%;">{{ detail.goods_sn }}</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>
<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>
......
......@@ -37,12 +37,59 @@
</view>
</view>
<view class="bor"></view>
<view class="item-tit">货品详情</view>
<view class="item-tit row verCenter">
<text v-for="(v, index) in item" :key="index" :class="{ curr: curr == index }" @click="tab(index)">{{ v }}</text>
</view>
<template v-if="curr == 1">
<view class="field-item row" style="margin-bottom: 40rpx;">
<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">
<text class="label">货品名称:</text>
<text class="tt">{{ detail.goods_name }}</text>
</view>
<view class="item row verCenter">
<text class="label">标准品牌:</text>
<text class="tt">{{ detail.brand_name }}</text>
</view>
<view class="item row verCenter">
<text class="label">包装方式:</text>
<text class="tt">{{ detail.packing_cn }}</text>
</view>
<view class="item row verCenter">
<text class="label">标准包装量:</text>
<text class="tt">{{ detail.mpq }}</text>
</view>
<view class="item row verCenter" style="flex: 0 0 100%;">
<text class="label" style="width: 130rpx;">标准包装长宽高:</text>
<text class="tt" style="max-width: 100%;">{{ detail.standard_length }} * {{ detail.standard_width }} * {{ detail.standard_high }} cm</text>
</view>
<view class="item row verCenter">
<text class="label">标准包装净重:</text>
<text class="tt">{{ detail.standard_net_weight }}{{ detail.standard_gross_weight_size }}</text>
</view>
<view class="item row verCenter">
<text class="label">标准包装毛重:</text>
<text class="tt">{{ detail.standard_gross_weight }}</text>
</view>
<view class="item row verCenter" style="flex: 0 0 100%;">
<text class="label">其他属性:</text>
<text class="tt" style="max-width: 100%;">{{ detail.picking_other_attr }}</text>
</view>
</view>
</template>
<template v-else>
<view class="field-item row">
<view class="item row verCenter" style="flex: 0 0 100%;">
<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>
......@@ -106,9 +153,10 @@
<view class="bor"></view>
<view class="tip-box row verCenter" v-if="workingRule">
<text class="iconfont icon-a-juxing4"></text>
<text class="t1">{{ workingRuleList.prefix || '' }}{{ workingRuleList.execute_type_val || '' }}库位:</text>
<text class="t2">{{ workingRule }}</text>
<text class="t1">{{ workingRuleList.execute_type_val || '' }}库位:</text>
<text class="t2" @click="assignment(workingRule)">{{ workingRule }}</text>
</view>
</template>
<view class="field-item row">
<view class="item row verCenter">
<text class="label">销 售 员:</text>
......@@ -146,10 +194,13 @@ import debounce from 'lodash/debounce';
export default {
data() {
return {
isZY: false, //区分是否自营
isInputFocus: false,
is_submit: true,
input_flag: false,
index: 0,
curr: 0,
item: ['货品信息', '其他信息'],
array: ['入库批次号'],
detail: {},
workingRuleList: {}, //,//推荐库位
......@@ -177,6 +228,9 @@ export default {
}, 2000);
},
methods: {
tab(index) {
this.curr = index;
},
/**
* 单号搜索
* @param {Object} event
......@@ -227,6 +281,12 @@ export default {
this.index = e.detail.value;
},
/**
*点击推荐库位就赋值到库位
*/
assignment(val) {
this.formParams.position_code = val;
},
/**
* 获取详情数据
*/
getData() {
......@@ -235,6 +295,10 @@ export default {
this.detail = res.data;
this.formParams.qty_on_shelf = res.data.pending_shelf_qty;
this.formParams.tally_id = res.data.tally_id;
this.isZY = res.data.sku_id > 0 ? true : false;
if (!this.isZY) {
this.item.splice(1, 1);
}
if (res.data.stock_in_type != 2) {
this.getWorkingRuleList();
} else {
......
......@@ -71,6 +71,10 @@
<text class="label">货品编码:</text>
<text class="tt">{{ item.goods_sn }}</text>
</view>
<view class="text-item row verCenter" v-if="item.sku_id > 0">
<text class="label">自营货品ID:</text>
<text class="tt">{{ item.sku_id }}</text>
</view>
<view class="text-item row verCenter">
<text class="label">货品名称:</text>
<text class="tt">{{ item.goods_name }}</text>
......@@ -119,15 +123,6 @@
<text class="iconfont icon-a-juxing21"></text>
<text class="text">查不到当前数据</text>
</view>
<!--
<view class="fix-btn row verCenter">
<view class="btn1 row rowCenter verCenter" @click="allChnage()">
<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('', 2)">补打入库标签</view>
</view>
-->
<!-- 详情 -->
<uni-drawer ref="showRight" mode="right">
<view class="uni-drawer-detail" v-if="detail">
......@@ -160,6 +155,10 @@
<text class="label">货品编码:</text>
<text class="tt">{{ detail.goods_sn }}</text>
</view>
<view class="item row verCenter" v-if="detail.sku_id > 0">
<text class="label">自营货品ID:</text>
<text class="tt">{{ detail.sku_id }}</text>
</view>
<view class="item row verCenter">
<text class="label">货品名称:</text>
<text class="tt">{{ detail.goods_name }}</text>
......
......@@ -40,6 +40,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>
......@@ -133,6 +137,10 @@
<text class="label">货品编码:</text>
<text class="tt">{{ detail.goods_sn }}</text>
</view>
<view class="item row verCenter" v-if="detail.sku_id > 0">
<text class="label">自营货品ID:</text>
<text class="tt">{{ detail.sku_id }}</text>
</view>
<view class="item row verCenter">
<text class="label">货品名称:</text>
<text class="tt">{{ detail.goods_name }}</text>
......@@ -229,6 +237,23 @@
<view class="input-title"><text class="input-title-t2">目标打印机:</text></view>
<view class="input-box"><input type="text" class="uni-input" placeholder-style="color:#919399" placeholder="请输入目标打印机IP (比如:192.168.2.1)" v-model="formParams.ip" /></view>
</view>
<template v-if="isZy">
<view class="form-input">
<view class="input-title">
<text class="input-title-t1">*</text>
<text class="input-title-t2">打印样式:</text>
</view>
<view class="select-box row">
<picker @change="bindPickerChange($event, 3)" :value="print_style_index" :range="print_style" style="width: 100%;">
<view class="row verCenter bothSide wrap">
<view class="uni-input">{{ print_style_index == -1 ? '请选择' : print_style[print_style_index] }}</view>
<view class="uni-arrow"></view>
</view>
</picker>
</view>
</view>
</template>
<template v-else>
<view class="form-input">
<view class="input-title">
<text class="input-title-t1">*</text>
......@@ -243,6 +268,7 @@
</picker>
</view>
</view>
</template>
<view class="btn row rowCenter verCenter"><view class="row btn1 row rowCenter verCenter" style="width:100%" @click="printLabelChange()">打印</view></view>
</view>
</uni-drawer>
......@@ -257,6 +283,7 @@ import debounce from 'lodash/debounce';
export default {
data() {
return {
isZy: false, //区分是否是自营
index: 0,
array: ['全量搜索'],
noexebshowFalg: true, //控制是否会触发生命周期
......@@ -271,6 +298,8 @@ export default {
stocktake_qty: '', //盘点数量
tag_version: ['中文标签', '英文标签'],
tag_version_index: 0,
print_style: ['基本样式', '不带D/C'],
print_style_index: -1,
searchParams: {
stocktake_id: '',
keyword: ''
......@@ -281,7 +310,8 @@ export default {
label_num: '', //标签货品数量
label_num_type: 1, //标签类型
ip: '', //目标打印机
print_language: 1 //标签版本
print_language: 1, //标签版本
print_style: ''
}
};
},
......@@ -347,6 +377,8 @@ export default {
return false;
}
var filteredList = this.list.filter(item => this.filter_id.includes(item.stocktake_items_id));
//根据盘点单的仓库展示不同标签模板下拉选择框
this.isZy = filteredList[0].is_zy == 0 ? false : true;
if (this.filter_id.length > 1) {
//如果勾选的是多个,则显示两个单选项:按库存数量、按盘点数据
this.formParams.label_num = this.filter_id.length;
......@@ -373,6 +405,11 @@ export default {
//补打入库标签
this.tag_version_index = e.detail.value;
this.formParams.print_language = Number(e.detail.value) + 1;
} else if (type == 3) {
//打印样式
this.print_style_index = e.detail.value;
this.formParams.print_style = Number(e.detail.value) + 1;
this.formParams.print_language = 1;
}
},
radioChange(e) {
......
......@@ -40,7 +40,7 @@
<text class="label">创建时间:</text>
<text class="tt">{{ item.create_time }}</text>
</view>
<navigator class="btn-box row" :url="'/pages/transfer/task?transfer_id=' + item.transfer_id" hover-class="none"><view class="btn row rowCenter verCenter">选择</view></navigator>
<navigator class="btn-box row" :url="'/pages/transfer/task?transfer_id=' + item.transfer_id + '&transfer_sn=' + item.transfer_sn" hover-class="none"><view class="btn row rowCenter verCenter">选择</view></navigator>
</view>
</view>
<!-- 无数据展示 -->
......
......@@ -41,6 +41,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>
......@@ -85,7 +89,7 @@
<text class="iconfont icon-a-juxing21"></text>
<text class="text">查不到当前数据</text>
</view>
<!-- 位移操作弹窗 -->
<!-- 移位操作弹窗 -->
<uni-drawer ref="showRight" mode="right">
<view class="uni-drawer-tally-receive-detail" v-if="detail">
<view class="title row rowCenter verCenter">
......@@ -105,6 +109,10 @@
<text class="label">容 器:</text>
<text class="text">{{ detail.container_name }}</text>
</view>
<view class="item row verCenter" style="flex: 0 0 100%;" v-if="detail.sku_id">
<text class="label">自营货品ID:</text>
<text class="text">{{ detail.sku_id }}</text>
</view>
</view>
<view class="bor"></view>
<view class="item-tit">货品详情</view>
......@@ -204,6 +212,7 @@ export default {
return {
is_submit: true,
transfer_id: '',
transfer_sn: '',
input_flag_origin_pos_code: false,
input_flag_stock_in_batch_sn: false,
input_flag_position_code: false,
......@@ -230,6 +239,11 @@ export default {
},
onLoad(options) {
this.searchParams.transfer_id = options.transfer_id || '';
this.searchParams.transfer_sn = options.transfer_sn || '';
uni.setNavigationBarTitle({
title: this.searchParams.transfer_sn
});
},
onShow() {
this.getData();
......
// const API_BASE_USER = 'http://user.liexindev.net'; //用户系统
// const API_BASE_PUR = 'http://pur.liexindev.net'; //采购系统
// const API_BASE = 'http://wms.liexindev.net'; //WMS系统
// const API_BASE_OSS = 'http://image.liexindev.net'; //oss系统
const API_BASE_USER = 'http://user.liexindev.net'; //用户系统
const API_BASE_PUR = 'http://pur.liexindev.net'; //采购系统
const API_BASE = 'http://wms.liexindev.net'; //WMS系统
const API_BASE_OSS = 'http://image.liexindev.net'; //oss系统
const API_BASE_USER = 'https://user.ichunt.net'; //用户系统
const API_BASE_PUR = 'https://purchase.ichunt.net'; //采购系统
const API_BASE = 'https://wms.ichunt.net'; //WMS系统
const API_BASE_OSS = 'https://image.ichunt.net'; //oss系统
// const API_BASE_USER = 'https://user.ichunt.net'; //用户系统
// const API_BASE_PUR = 'https://purchase.ichunt.net'; //采购系统
// const API_BASE = 'https://wms.ichunt.net'; //WMS系统
// const API_BASE_OSS = 'https://image.ichunt.net'; //oss系统
const API = {
......@@ -306,7 +306,19 @@ const API = {
/**
* 盘点标签补打
* */
printLabel: API_BASE + '/api/h5/stocktake/printLabel'
printLabel: API_BASE + '/api/h5/stocktake/printLabel',
/**
* 库存查询_移位
* */
searchStockListByYW: API_BASE + '/api/h5/stockIn/searchStockListByYW',
/**
* 快速移位
* */
quickTransfer: API_BASE + '/api/transfer/quickTransfer',
/**
* 快速移位记录
* */
quickTransferLog: API_BASE + '/api/transfer/quickTransferLog'
}
......
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