Commit 8c21b5de by LJM

js

parent a1833f02
{
"name" : "wmsApp",
"appid" : "__UNI__655E80D",
"description" : "",
"versionName" : "1.0.0",
"versionCode" : "100",
"transformPx" : false,
"name": "wmsApp",
"appid": "__UNI__655E80D",
"description": "",
"versionName": "1.0.0",
"versionCode": "100",
"transformPx": false,
/* 5+App特有相关 */
"app-plus" : {
"usingComponents" : true,
"nvueStyleCompiler" : "uni-app",
"compilerVersion" : 3,
"splashscreen" : {
"alwaysShowBeforeRender" : true,
"waiting" : true,
"autoclose" : true,
"delay" : 0
"app-plus": {
"usingComponents": true,
"nvueStyleCompiler": "uni-app",
"compilerVersion": 3,
"splashscreen": {
"alwaysShowBeforeRender": true,
"waiting": true,
"autoclose": true,
"delay": 0
},
/* 模块配置 */
"modules" : {},
"modules": {},
/* 应用发布信息 */
"distribute" : {
"distribute": {
/* android打包配置 */
"android" : {
"permissions" : [
"android": {
"permissions": [
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
......@@ -41,47 +41,47 @@
]
},
/* ios打包配置 */
"ios" : {
"dSYMs" : false
"ios": {
"dSYMs": false
},
/* SDK配置 */
"sdkConfigs" : {
"ad" : {}
"sdkConfigs": {
"ad": {}
}
},
"nvueLaunchMode" : ""
"nvueLaunchMode": ""
},
/* 快应用特有相关 */
"quickapp" : {},
"quickapp": {},
/* 小程序特有相关 */
"mp-weixin" : {
"appid" : "wx61a41a064fa2fb3c",
"setting" : {
"urlCheck" : false,
"postcss" : true,
"es6" : true,
"minified" : true
"mp-weixin": {
"appid": "wx61a41a064fa2fb3c",
"setting": {
"urlCheck": false,
"postcss": true,
"es6": false,
"minified": true
},
"usingComponents" : true
"usingComponents": true
},
"mp-alipay" : {
"usingComponents" : true
"mp-alipay": {
"usingComponents": true
},
"mp-baidu" : {
"usingComponents" : true
"mp-baidu": {
"usingComponents": true
},
"mp-toutiao" : {
"usingComponents" : true
"mp-toutiao": {
"usingComponents": true
},
"uniStatistics" : {
"enable" : false
"uniStatistics": {
"enable": false
},
"vueVersion" : "2",
"quickapp-webview" : {
"icon" : "wms",
"package" : "com.liexin.wms",
"versionName" : "1.0",
"minPlatformVersion" : "1.0"
"vueVersion": "2",
"quickapp-webview": {
"icon": "wms",
"package": "com.liexin.wms",
"versionName": "1.0",
"minPlatformVersion": "1.0"
},
"fallbackLocale" : "zh-Hans"
}
"fallbackLocale": "zh-Hans"
}
\ No newline at end of file
......@@ -18,7 +18,7 @@
</view>
</view>
<view class="list row bothSide" v-if="list.length > 0">
<navigator class="box" v-for="(item, index) in list" :key="index" :url="'/pages/picking/sort?stock_out_id=' + item.stock_out_id" hover-class="none">
<navigator class="box" v-for="(item, index) in list" :key="index" :url="'/pages/picking/sort?stock_out_id=' + item.stock_out_id + '&stock_out_sn=' + item.stock_out_sn" hover-class="none">
<view class="text-item row verCenter">
<text class="label">出库单号:</text>
<text class="t1">{{ item.stock_out_sn }}</text>
......
......@@ -59,6 +59,7 @@
<script>
import { API } from '@/util/api.js';
import debounce from 'lodash/debounce';
export default {
data() {
return {
......
......@@ -91,7 +91,7 @@
<text class="label">销 售 员:</text>
<text class="text">{{item.sale_name}}</text>
</view>
<view class="btn row rowCenter verCenter" @click="showDrawer(1)">拣货</view>
<view class="btn row rowCenter verCenter" @click="showDrawer(1,item)">拣货</view>
</view>
</view>
<!-- 无数据展示 -->
......@@ -106,30 +106,22 @@
<view class="box" v-for="(item, index) in list" :key="index">
<view class="input-box row verCenter">
<text class="label">库 位:</text>
<text class="tt">A65512</text>
<text class="tt">{{item.position_name}}</text>
</view>
<view class="input-box row verCenter">
<text class="label">容 器:</text>
<text class="tt">L-ASN2201010001</text>
<text class="tt">{{item.container_sn}}</text>
</view>
<view class="bor"></view>
<view class="input-box row verCenter">
<text class="label">任 务 数:</text>
<text class="text">88</text>
</view>
<view class="input-box row verCenter">
<text class="label">货品名称:</text>
<text class="text">A65512</text>
<text class="text">{{item.task_num}}</text>
</view>
<view class="input-box row verCenter">
<text class="label">合计应拣数量:</text>
<text class="text">TI</text>
</view>
<view class="input-box row verCenter">
<text class="label">销 售 员:</text>
<text class="text">朱国军</text>
<text class="text">{{item.total_pick_num}}</text>
</view>
<view class="btn row rowCenter verCenter" @click="showDrawer(2)">选择</view>
<view class="btn row rowCenter verCenter" @click="showDrawer(2,item)">选择</view>
</view>
</view>
<!-- 无数据展示 -->
......@@ -141,19 +133,19 @@
</view>
<!-- 按货品拣货详情弹窗 -->
<uni-drawer ref="showRight" mode="right">
<view class="uni-drawer-picking">
<view class="uni-drawer-picking" v-if="detail">
<view class="title row rowCenter verCenter">
<text class="iconfont icon-juxing2" @click="closeDrawer(1)"></text>
<text class="text">按货品拣货</text>
<text class="text">{{stock_out_sn}}</text>
</view>
<view class="field-item row" style="margin-top: 39rpx;">
<view class="item row verCenter">
<text class="label">入库批次号:</text>
<text class="text">ASN2201010001</text>
<text class="text">{{detail.stock_in_batch_sn}}</text>
</view>
<view class="item row verCenter">
<text class="label">库 位:</text>
<text class="text">A65512</text>
<text class="text">{{detail.position_name}}</text>
</view>
</view>
<view class="bor"></view>
......@@ -161,68 +153,68 @@
<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%;">6546546416541654665</text>
<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%;">ASD3DAADS22</text>
<text class="tt" style="max-width: 100%;">{{detail.goods_name}}</text>
</view>
<view class="item row verCenter" style="flex: 0 0 100%;">
<text class="label">标准品牌:</text>
<text class="tt" style="max-width: 100%;">Nexperia</text>
<text class="tt" style="max-width: 100%;">{{detail.brand_name}}</text>
</view>
<view class="item row verCenter">
<text class="label">D / C:</text>
<text class="tt">22+</text>
<text class="tt">{{detail.date_code}}</text>
</view>
<view class="item row verCenter">
<text class="label">产 地:</text>
<text class="tt">美国</text>
<text class="tt">{{detail.coo}}</text>
</view>
<view class="item row verCenter">
<text class="label">货品品质:</text>
<text class="tt">良品</text>
<text class="tt">{{detail.quality_val}}</text>
</view>
<view class="item row verCenter">
<text class="label">入 仓 号:</text>
<text class="tt">C12345</text>
<text class="tt">{{detail.inhouse}}</text>
</view>
<view class="item row verCenter" style="flex: 0 0 100%;margin-bottom: 17rpx;">
<text class="label">其他批次属性:</text>
<text class="tt">-</text>
<text class="tt">{{detail.other_batch_attr}}</text>
</view>
</view>
<view class="bor"></view>
<view class="field-item row">
<view class="item row verCenter">
<text class="label">应拣数量:</text>
<text class="tt">100000</text>
<text class="tt">{{detail.pick_qty}}</text>
</view>
<view class="item row verCenter">
<text class="label">单 位:</text>
<text class="tt">PCS</text>
<text class="tt">{{detail.goods_unit}}</text>
</view>
</view>
<view class="form-input">
<view class="input-title"><text class="input-title-t1">拣货数量:</text></view>
<view class="input-box"><input type="text" class="uni-input" placeholder-style="color:#919399" placeholder="请输入" /></view>
<view class="input-box"><input type="text" class="uni-input" placeholder-style="color:#919399" placeholder="请输入" v-model="formParams.pick_qty"/></view>
</view>
<view class="bor"></view>
<view class="field-item row">
<view class="item row verCenter">
<text class="label">销 售 员:</text>
<text class="tt">100000</text>
<text class="tt">{{detail.sale_name}}</text>
</view>
<view class="item row verCenter">
<text class="label">采 购 员:</text>
<text class="tt">PCS</text>
<text class="tt">{{detail.pur_user_name}}</text>
</view>
<view class="item row verCenter" style="flex: 0 0 100%;">
<text class="label">收货客户:</text>
<text class="tt">深圳市猎芯科技有限公司</text>
<text class="tt" style="max-width: 100%;">{{detail.customer_name}}</text>
</view>
</view>
<view class="btn row verCenter bothSide"><view class="btn1 row rowCenter verCenter">拣 货</view></view>
<view class="btn row verCenter bothSide"><view class="btn1 row rowCenter verCenter" @click="pick(detail.lock_id,formParams.pick_qty,detail.stock_out_item_id)">拣 货</view></view>
</view>
</uni-drawer>
<!-- 按容器拣货详情弹窗 -->
......@@ -230,88 +222,88 @@
<view class="uni-drawer-picking">
<view class="title row rowCenter verCenter">
<text class="iconfont icon-juxing2" @click="closeDrawer(2)"></text>
<text class="text">按容器拣货</text>
<text class="text">{{stock_out_sn}}</text>
</view>
<view class="field-item row" style="margin-top: 39rpx;">
<view class="item row verCenter">
<text class="label">库 位:</text>
<text class="text">A00001</text>
<text class="text">{{detailContainer.position_name}}</text>
</view>
<view class="item row verCenter">
<text class="label">库 位</text>
<text class="text">A65512</text>
<text class="label">容器</text>
<text class="text">{{detailContainer.container_sn}}</text>
</view>
<view class="item row verCenter">
<text class="label">任 务 数:</text>
<text class="tt">8</text>
<text class="tt">{{detailContainer.task_num}}</text>
</view>
<view class="item row verCenter">
<text class="label">合计应拣数量:</text>
<text class="tt">1118</text>
<text class="tt">{{detailContainer.total_pick_num}}</text>
</view>
</view>
<view class="bor"></view>
<view class="item-tit">货品明细</view>
<view class="list-drawer">
<scroll-view style="max-height: 755rpx" scroll-y="true">
<view class="box row" v-for="(item, index) in 25" :key="index">
<view class="box row" v-for="(item, index) in detailContainer.list" :key="index">
<view class="input-box row verCenter" style="flex: 0 0 100%;">
<text class="label">入库批次号:</text>
<text class="tt">L-ASN2201010001</text>
<text class="tt">{{item.stock_in_batch_sn}}</text>
</view>
<view class="bor" style="flex: 0 0 100%;"></view>
<view class="input-box row verCenter">
<text class="label">货品编码:</text>
<text class="text">L-ASN2201010001</text>
<text class="text">{{item.goods_sn}}</text>
</view>
<view class="input-box row verCenter">
<text class="label">货品名称:</text>
<text class="text">A65512</text>
<text class="text">{{item.goods_name}}</text>
</view>
<view class="input-box row verCenter">
<text class="label">标准品牌:</text>
<text class="text">TI</text>
<text class="text">{{item.brand_name}}</text>
</view>
<view class="input-box row verCenter">
<text class="label">D / C:</text>
<text class="text">22+</text>
<text class="text">{{item.date_code}}</text>
</view>
<view class="input-box row verCenter">
<text class="label">产 地:</text>
<text class="text">C12345</text>
<text class="text">{{item.coo}}</text>
</view>
<view class="input-box row verCenter">
<text class="label">货品品质:</text>
<text class="text">良品</text>
<text class="text">{{item.quality_val}}</text>
</view>
<view class="input-box row verCenter">
<text class="label">入 仓 号:</text>
<text class="text">C12345</text>
<text class="text">{{item.inhouse}}</text>
</view>
<view class="input-box row verCenter">
<text class="label">其他批次属性:</text>
<text class="text">-</text>
<text class="text">{{item.other_batch_attr}}</text>
</view>
<view class="input-box row verCenter" style="flex: 0 0 100%;">
<text class="label">拣货数量:</text>
<text class="text" style="color: #F98119;">2121</text>
<text class="text" style="color: #F98119;">{{item.pick_qty}}</text>
</view>
<view class="input-box row verCenter">
<text class="label">销 售 员:</text>
<text class="text">朱国军</text>
<text class="text">{{item.sale_name}}</text>
</view>
<view class="input-box row verCenter">
<text class="label">采 购 员:</text>
<text class="text">牛荣壮</text>
<text class="text">{{item.pur_user_name}}</text>
</view>
<view class="input-box row verCenter">
<text class="label">收货客户:</text>
<text class="text">猎芯科技有限公司</text>
<text class="text">{{item.customer_name}}</text>
</view>
</view>
</scroll-view>
</view>
<view class="btn row verCenter bothSide"><view class="btn1 row rowCenter verCenter">拣 货</view></view>
<view class="btn row verCenter bothSide"><view class="btn1 row rowCenter verCenter" @click="makeMultiPickingFinish()">拣 货</view></view>
</view>
</uni-drawer>
</view>
......@@ -323,6 +315,8 @@ import debounce from 'lodash/debounce';
export default {
data() {
return {
stock_out_sn:'',//标题显示出库单号
lock_ids:[], //出库id集合
input_flag_position_name:false,
input_flag_stock_in_batch_sn:false,
input_flag_container_sn:false,
......@@ -331,12 +325,16 @@ export default {
curr: 0,
itemArr: ['按货品拣货', '按容器拣货'],
list: [],
detail:{},
detail:{},//按货品拣货详情
detailContainer:{},//按容器拣货详情
searchParams: {
stock_out_id: '',
position_name: '',
stock_in_batch_sn: '',
container_sn:''
},
formParams:{
pick_qty:''
}
};
},
......@@ -348,6 +346,7 @@ export default {
}
},
onLoad(options) {
this.stock_out_sn=options.stock_out_sn || '';
this.searchParams.stock_out_id = options.stock_out_id || '';
},
onShow() {
......@@ -356,12 +355,18 @@ export default {
methods: {
tab(index) {
this.curr = index;
this.getData();
},
showDrawer(type) {
showDrawer(type,data) {
if (type == 1) {
this.$refs.showRight.open();
this.detail=data;
} else if (type == 2) {
this.$refs.showRightPack.open();
this.detailContainer=data;
this.lock_ids=data.list.map(function(item){
return item.lock_id;
});
}
},
closeDrawer(type) {
......@@ -375,7 +380,16 @@ export default {
* 获取列表数据
*/
getData() {
this.request(API.getLockedList, 'POST', { page: this.page, limit: this.limit, ...this.searchParams }, false).then(res => {
var URL='';
if(this.curr == 0){
URL=API.getLockedList;
}else if(this.curr == 1){
URL=API.getLockedContainerList;
}
uni.setNavigationBarTitle({
title: this.stock_out_sn+'拣货'
})
this.request(URL, 'POST', { page: this.page, limit: this.limit, ...this.searchParams }, false).then(res => {
if (res.code === 0) {
this.list = res.data.list;
} else {
......@@ -403,6 +417,53 @@ export default {
this.getData();
},
/**
* 按货品拣货提交
*/
pick(lock_id,pick_qty,stock_out_item_id){
this.request(API.pick, 'POST', { lock_id:lock_id,pick_qty:pick_qty,stock_out_item_id:stock_out_item_id}, true).then(res => {
if (res.code === 0) {
uni.showToast({
title: '拣货成功',
icon: 'success'
});
s;
setTimeout(() => {
this.getData();
this.closeDrawer(1);
}, 2000);
} else {
uni.showModal({
itle: '提示',
content: res.msg,
showCancel: false
});
}
});
},
/**
* 按容器拣货提交
*/
makeMultiPickingFinish(){
this.request(API.makeMultiPickingFinish, 'POST', { stock_out_id:this.searchParams.stock_out_id,lock_ids:this.lock_ids.join(',')}, true).then(res => {
if (res.code === 0) {
uni.showToast({
title: '拣货成功',
icon: 'success'
});
setTimeout(() => {
this.getData();
this.closeDrawer(2);
}, 2000);
} else {
uni.showModal({
itle: '提示',
content: res.msg,
showCancel: false
});
}
});
},
/**
* 单号搜索
* @param {Object} event
*/
......
......@@ -68,10 +68,22 @@ const API = {
* */
getNoTakeList: API_BASE + '/api/stockOut/getNoTakeList',
/**
* 拣货-锁库明细列表
* 拣货-拣货列表
* */
getLockedList: API_BASE + '/api/stockOut/getLockedList',
/**
* 拣货-容器列表
* */
getLockedContainerList: API_BASE + '/api/stockOut/getLockedContainerList',
/**
* 拣货-货品拣货
* */
pick: API_BASE + '/api/stockOut/pick',
/**
* 拣货-批量拣货完成
* */
makeMultiPickingFinish: API_BASE + '/api/stockOut/makeMultiPickingFinish',
/**
* 上传文件
* */
upload: API_BASE_LIEXIN + '/oss/upload',
......
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