From 4a01b5f1b111885aa0cadf3d5f96fee78413be16 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 26 九月 2025 15:09:29 +0800
Subject: [PATCH] 1
---
pages/home/home.vue | 156 ++++----
pages/pakin/mergeStore2.vue | 611 +++++++++++++++++++++++++++++++++++
pages.json | 2
pages/AGV/AGVkongban.vue | 42 +
pages/pakin/mergeStore.vue | 186 ++--------
pages/pakin/pakin.vue | 6
6 files changed, 767 insertions(+), 236 deletions(-)
diff --git a/pages.json b/pages.json
index 5c8dc0a..24276cb 100644
--- a/pages.json
+++ b/pages.json
@@ -111,7 +111,7 @@
{
"path": "pages/AGV/AGVkongban",
"style": {
- "navigationBarTitleText": "AGV鍛煎彨绌烘墭鐩�"
+ "navigationBarTitleText": "鍛煎彨绌烘墭鐩�"
}
},
{
diff --git a/pages/AGV/AGVkongban.vue b/pages/AGV/AGVkongban.vue
index 9e114e5..868dda5 100644
--- a/pages/AGV/AGVkongban.vue
+++ b/pages/AGV/AGVkongban.vue
@@ -1,19 +1,22 @@
<template>
<view>
<view class="code">
- <view class="item">
+ <!-- <view class="item">
<view class="code-decs">绔欑偣:</view>
<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="stationCode" :focus="stationCodeFocus"
>
- </view>
+ </view> -->
<view class="item">
<view class="code-decs" style="width: 25vw;">澶у皬鎵樼洏:</view>
<radio-group @change="isFullPlt">
<label>
- <radio :checked="ck1" style="transform: scale(0.7)"/><text>灏忔墭鐩�</text>
+ <radio :checked="ck1" style="transform: scale(0.7)"/><text>浣�</text>
</label>
<label>
- <radio :checked="ck2" style="margin-left: 50rpx;transform: scale(0.7);"/><text>澶ф墭鐩�</text>
+ <radio :checked="ck2" style="margin-left: 50rpx;transform: scale(0.7);"/><text>涓�</text>
+ </label>
+ <label>
+ <radio :checked="ck3" style="margin-left: 50rpx;transform: scale(0.7);"/><text>楂�</text>
</label>
</radio-group>
</view>
@@ -139,6 +142,7 @@
fullPlt: '1',
ck1: true,
ck2: false,
+ ck3: false,
}
},
onLoad() {
@@ -150,20 +154,28 @@
methods: {
// 澶у皬鎵樼洏
isFullPlt() {
- var temp = this.ck1
- this.ck1 = this.ck2
- this.ck2 = temp
if (this.ck1) {
this.fullPlt = '1'
- } else {
+ this.ck1 =true
+ this.ck2 =false
+ this.ck3 =false
+ } else if(this.ck2){
this.fullPlt = '2'
+ this.ck1 =false
+ this.ck2 =true
+ this.ck3 =false
+ }else{
+ this.fullPlt = '3'
+ this.ck1 =false
+ this.ck2 =false
+ this.ck3 =true
}
},
stationCodeInput() {
let that = this;
that.staList = []
uni.request({
- url: that.baseUrl + '/mobile/FillEmptyPallets?locNo='+that.stationCode+'&size='+that.fullPlt,
+ url: that.baseUrl + '/mobile/empty/plate/out/start',
header: {
'token': uni.getStorageSync('token')
},
@@ -455,13 +467,13 @@
},
comb() {
let that = this;
- if (that.stationCode === '') {
- this.messageText = "璇锋壂鎻忕珯鐐�"
- this.messageToggle('error')
- return;
- }
+ // if (that.stationCode === '') {
+ // this.messageText = "璇锋壂鎻忕珯鐐�"
+ // this.messageToggle('error')
+ // return;
+ // }
uni.request({
- url: that.baseUrl + '/mobile/FillEmptyPallets?locNo='+that.stationCode+'&size='+that.fullPlt,
+ url: that.baseUrl + '/mobile/empty/plate/out/start?type='+that.fullPlt,
header: {
'token': uni.getStorageSync('token')
},
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 4b98ef2..9386c78 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -31,52 +31,53 @@
cuIcon: 'pullup',
url: '/pakin/pakin'
},
- {
- title: 'AGV缁勬墭鍏ュ簱',
- name: 'AGVPakin',
- color: 'cyan',
- cuIcon: 'pullup',
- url: '/AGV/AGVPakin'
- },
- {
- title: 'AGV楠屽竷鍏ュ簱',
- name: 'pakin',
- color: 'cyan',
- cuIcon: 'pullup',
- url: '/AGV/AGVYBPakin'
- },
- {
- title: 'AGV璁㈠崟鍏ュ簱',
- name: 'pakin',
- color: 'cyan',
- cuIcon: 'pullup',
- url: '/order/orderPakin3'
- },
- {
- title: '琛ョ┖鎵樼洏',
- name: 'AGVFillEmptyPallets',
- color: 'blue',
- cuIcon: 'order',
- url: '/AGV/AGVkongban'
- },{
- title: '鍑哄簱纭--鎵瑰彿鏍￠獙',
- name: 'outConfilm',
- color: 'red',
- cuIcon: 'pullup',
- url: '/pakin/outConfilm'
- },{
- title: '鍑哄簱纭',
- name: 'outConfilm',
- color: 'red',
- cuIcon: 'pullup',
- url: '/pakin/outConfilm1'
- },{
- title: '绌烘澘鍥炲簱鎴栬�呮嫞鏂欏洖搴�',
- name: 'AGVStart',
- color: 'yellow',
- cuIcon: 'order',
- url: '/AGV/AGVStart-return'
- },
+ // {
+ // title: 'AGV缁勬墭鍏ュ簱',
+ // name: 'AGVPakin',
+ // color: 'cyan',
+ // cuIcon: 'pullup',
+ // url: '/AGV/AGVPakin'
+ // },
+ // {
+ // title: 'AGV楠屽竷鍏ュ簱',
+ // name: 'pakin',
+ // color: 'cyan',
+ // cuIcon: 'pullup',
+ // url: '/AGV/AGVYBPakin'
+ // },
+ // {
+ // title: 'AGV璁㈠崟鍏ュ簱',
+ // name: 'pakin',
+ // color: 'cyan',
+ // cuIcon: 'pullup',
+ // url: '/order/orderPakin3'
+ // },
+ // {
+ // title: '琛ョ┖鎵樼洏',
+ // name: 'AGVFillEmptyPallets',
+ // color: 'blue',
+ // cuIcon: 'order',
+ // url: '/AGV/AGVkongban'
+ // },
+ //{
+ // title: '鍑哄簱纭--鎵瑰彿鏍￠獙',
+ // name: 'outConfilm',
+ // color: 'red',
+ // cuIcon: 'pullup',
+ // url: '/pakin/outConfilm'
+ // },{
+ // title: '鍑哄簱纭',
+ // name: 'outConfilm',
+ // color: 'red',
+ // cuIcon: 'pullup',
+ // url: '/pakin/outConfilm1'
+ // },{
+ // title: '绌烘澘鍥炲簱鎴栬�呮嫞鏂欏洖搴�',
+ // name: 'AGVStart',
+ // color: 'yellow',
+ // cuIcon: 'order',
+ // url: '/AGV/AGVStart-return'
+ // },
// {
// title: '鍐嶆鎷ｆ枡',
// name: 'changePallet',
@@ -91,33 +92,32 @@
// cuIcon: 'pullup',
// url: '/order/orderPakin'
// },
- {
- title: 'AGV鐐瑰埌鐐圭Щ鍔ㄤ换鍔�',
- name: 'AGVStart',
- color: 'green',
- cuIcon: 'order',
- url: '/AGV/AGVStart'
- },{
- title: 'AGV鐐瑰埌鍖哄煙绉诲姩浠诲姟',
- name: 'AGVStart',
- color: 'green',
- cuIcon: 'order',
- url: '/AGV/AGVStartSITEZONE'
- },{
- title: 'AGV鍖哄煙鍒扮偣绉诲姩浠诲姟',
- name: 'AGVStart',
- color: 'green',
- cuIcon: 'order',
- url: '/AGV/AGVStartZONESITE'
- },
// {
- // title: 'AGV鍛煎彨绌烘墭鐩�',
- // name: 'AGVkongban',
- // color: 'blue',
- // cuIcon: 'pullup',
- // url: '/AGV/AGVkongban'
+ // title: 'AGV鐐瑰埌鐐圭Щ鍔ㄤ换鍔�',
+ // name: 'AGVStart',
+ // color: 'green',
+ // cuIcon: 'order',
+ // url: '/AGV/AGVStart'
+ // },{
+ // title: 'AGV鐐瑰埌鍖哄煙绉诲姩浠诲姟',
+ // name: 'AGVStart',
+ // color: 'green',
+ // cuIcon: 'order',
+ // url: '/AGV/AGVStartSITEZONE'
+ // },{
+ // title: 'AGV鍖哄煙鍒扮偣绉诲姩浠诲姟',
+ // name: 'AGVStart',
+ // color: 'green',
+ // cuIcon: 'order',
+ // url: '/AGV/AGVStartZONESITE'
// },
-
+ {
+ title: '鍛煎彨绌烘墭鐩�',
+ name: 'AGVkongban',
+ color: 'blue',
+ cuIcon: 'pullup',
+ url: '/AGV/AGVkongban'
+ },
// {
// title: '缁勬墭涓婃灦',
// name: 'putOn',
@@ -181,13 +181,13 @@
// cuIcon: 'order',
// url: '/pakin/piking'
// },
- // {
- // title: '骞舵澘缁勬墭',
- // name: 'mergeStore',
- // color: 'olive',
- // cuIcon: 'order',
- // url: '/pakin/mergeStore'
- // },
+ {
+ title: '骞舵澘缁勬墭',
+ name: 'mergeStore',
+ color: 'olive',
+ cuIcon: 'order',
+ url: '/pakin/mergeStore'
+ },
// {
// title: '鎹㈡澘缁戝畾',
// name: 'changePallet',
diff --git a/pages/pakin/mergeStore.vue b/pages/pakin/mergeStore.vue
index edb9e4c..cd724b8 100644
--- a/pages/pakin/mergeStore.vue
+++ b/pages/pakin/mergeStore.vue
@@ -2,22 +2,13 @@
<view>
<view class="code">
<view class="item">
- <view class="code-decs">Bom鍙�:</view>
- <view style="flex: 1;">
- <input type="text" placeholder=" --" disabled="true" v-model="orderNo" :focus="orderNoFocus">
- </view>
- <view style="height:100%;line-height:2;width:40rpx;margin-right: 20rpx;">
- <!-- <uni-icons type="clear" color="#c1c1c1" @click="clearOrderNo()"></uni-icons> -->
- </view>
- </view>
- <view class="item">
<view class="code-decs">鎵樼洏鐮�:</view>
<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus"
@input="barcodeInput()">
</view>
<view class="item">
<view class="code-decs">鐗╂枡鐮�:</view>
- <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="matnr" :focus="matFocus" @input="checkBom()">
+ <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="matnr" :focus="matFocus" @input="findMat()">
<view class="item-right">
<button></button>
<text style="text-align: right;color: #409EFF;" @click="selectMat()">鎻愬彇+</text>
@@ -50,7 +41,7 @@
<view class="left-item">{{item.specs}}</view>
</view>
<view class="list-left-item">
- <view class="desc">鎵瑰彿锛�</view>
+ <view class="desc" style="width: 38%;">鎵瑰彿锛�</view>
<view class="left-item">
<uni-tag :text="item.batch" type="warning"></uni-tag>
</view>
@@ -62,9 +53,8 @@
</view>
</view> -->
<view class="list-left-item">
- <view class="left-item">鏁伴噺锛歿{item.anfme}}</view>
- </view>
- <view class="list-left-item">
+ <view class="desc">鏁伴噺锛�</view>
+ <view class="left-item">{{item.anfme}}</view>
</view>
</view>
<view class="list-right">
@@ -76,7 +66,7 @@
<!-- 搴曢儴鎿嶄綔鎸夐挳 -->
<view class="buttom">
<button size="mini" @click="reset('warn')">閲嶇疆</button>
- <button size="mini" type="primary" @click="combConfirm('warn')">缁勬墭</button>
+ <button size="mini" type="primary" @click="combConfirm('warn')">骞舵墭</button>
</view>
<!-- 寮圭獥 -->
<!-- 淇敼鏁伴噺 -->
@@ -93,8 +83,8 @@
</view>
</view>
<view class="popup-item">
- <view class="popup-item-left">鎵瑰彿:</view>
- <view class="popup-item-right"><input type="text" v-model="batch"></view>
+ <view class="popup-item-left" style="width: 20vw;">澶囨敞:</view>
+ <view class="popup-item-right" style="width: 46vw;"><input type="text" v-model="memo"></view>
</view>
<!-- <view class="popup-item">
<view class="popup-item-left">閲嶉噺:</view>
@@ -103,7 +93,7 @@
<view class="popup-item">
<view class="popup-item-left">鏁伴噺:</view>
<view class="popup-item-right" style="border: none;justify-content: center;">
- <uni-number-box :value="count" :step='1' :max="maxAn" color="#747474" @change="changeValue" />
+ <uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474" @change="changeValue" />
</view>
</view>
<view class="btn">
@@ -127,7 +117,7 @@
<uni-popup-message :type="msgType1" :message="messageText" :duration="2000"></uni-popup-message>
</uni-popup>
</view>
- <!-- 纭缁勬墭 -->
+ <!-- 纭骞舵墭 -->
<view>
<uni-popup ref="combConfirm" type="dialog">
<uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
@@ -151,7 +141,7 @@
baseUrl: '',
token: '',
barcode: '',
- orderNo: '',
+ memo: '',
dataList: [],
count: 0,
rowNum: '',
@@ -163,14 +153,10 @@
messageText: '',
title: '',
content: '',
- orderNoFocus: false,
barcodeFocus: true,
matFocus: false,
matData: '',
removeNum: 0,
- enterCount: 0,
- maxAnfme: 0,
- maxAn: 0
}
},
onLoad() {
@@ -185,46 +171,23 @@
this.msgType1 = type
this.$refs.message.open()
},
- clearOrderNo() {
- this.orderNo = ''
- let that = this;
- that.orderNoFocus = false;
- setTimeout(() => {
- that.orderNo = '';
- that.orderNoFocus = true;
- }, 100);
- },
- orderNoInput() {
- // 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
- setTimeout(() => {
- var len = this.orderNo.length
- this.barcodeFocuss()
- }, 200)
- },
// barcode input 浜嬩欢
barcodeInput() {
- let _this = this
- uni.request({
- url: _this.baseUrl + '/mobile/check/mergeStore/barcode',
- data: {barcode: _this.barcode},
- header: { 'token':uni.getStorageSync('token') },
- success(res) {
- res = res.data
- if (res.code === 200) {
- _this.focuss()
- _this.orderNo = res.data
- uni.showToast({ title: '鎿嶄綔鎴愬姛', icon: "none", position: 'top' })
- } else if (res.code === 403) {
- uni.showToast({ title: res.msg, icon: "none", position: 'top' })
- setTimeout(() => {
- uni.reLaunch({ url: '../login/login' });
- }, 1000);
- } else {
- _this.barcodeFocuss()
- uni.showToast({ title: res.msg, icon: "none", position: 'top' })
- }
+ this.barcode = this.barcode.replace(/^\{|\}$/g, '')
+ // 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
+ setTimeout(() => {
+ var len = this.barcode.length
+ if (len != 8) {
+ uni.showToast({
+ title: '鎵樼洏鐮佹湁璇閲嶈瘯',
+ icon: "none",
+ position: 'top'
+ });
+ this.barcodeFocuss()
+ return;
}
- })
+ this.focuss()
+ }, 200)
},
// 鎵樼洏鐮佹湁璇噸缃�
barcodeFocuss() {
@@ -237,63 +200,29 @@
},
// 鍟嗗搧鍏夋爣娓呯┖閲嶇疆
focuss() {
- this.focus = false;
+ this.barcodeFocus = false;
+ this.matFocus = false;
setTimeout(() => {
this.matnr = '';
this.matFocus = true;
}, 100);
},
- // 妫�楠屽綋鍓嶇墿鏂欐槸鍚︽槸鍦ㄥ綋鍓岯om琛ㄤ腑
- checkBom() {
- let _this = this
- uni.request({
- url: _this.baseUrl + '/mobile/comb/checkBom',
- data: JSON.stringify({
- bomCode: _this.orderNo,
- matnr: _this.matnr
- }),
- method: 'POST',
- header: { 'token': uni.getStorageSync('token') },
- success(res) {
- // console.log(res);
- res = res.data
- if (res.code === 200) {
- if (res.data) {
- _this.maxAnfme = res.data.zpalletAnfme
- _this.findMat()
- } else {
- _this.findMat()
- }
- } else if (res.code == 403) {
- uni.showToast({
- title: res.msg,
- icon: "none",
- position: 'top'
- })
- setTimeout(() => {
- uni.reLaunch({
- url: '../login/login'
- });
- }, 1000);
- } else {
- _this.matnr = ''
- uni.showToast({
- title: res.msg,
- icon: "none",
- position: 'top'
- })
- }
-
- }
- })
- },
// 鎼滅储鐗╂枡
findMat() {
let that = this
+ var mat = that.matnr
+ let submitMat
+ let newMatnr
+ if (mat.includes(';')) {
+ newMatnr = mat.split(';')
+ submitMat = newMatnr[1]
+ } else {
+ submitMat = mat
+ }
uni.request({
url: that.baseUrl + '/mat/auth',
data: {
- matnr: that.matnr
+ matnr: submitMat
},
header: {
'token': uni.getStorageSync('token')
@@ -304,11 +233,6 @@
that.matData = result.data
that.matnr = ''
that.matData['batch'] = ''
- if (that.maxAnfme > 0) {
- that.matData['maxNum'] = that.maxAnfme
- } else if (that.maxAnfme == 0){
- that.matData['maxNum'] = 0
- }
uni.navigateTo({
url: "../mat/matSelected",
// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
@@ -320,7 +244,6 @@
// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
events: {
matList: function(data) {
- console.log(data);
that.checkMat(data.data)
that.focuss()
},
@@ -399,22 +322,17 @@
}
}
if (add) {
- // if (this.maxAnfme) {
- // mat['maxAnfme'] = this.maxAnfme
- // mat.anfme = this.maxAnfme
-
- // }
this.dataList.unshift(mat)
}
- this.maxAnfme = ''
+ this.$forceUpdate() // 寮哄埗鍒锋柊
},
// 淇敼鎵瑰彿
revise(item, i) {
this.matnr = this.dataList[i].matnr
this.count = this.dataList[i].anfme
this.batch = this.dataList[i].batch
+ this.memo = this.dataList[i].memo
this.weight = this.dataList[i].weight
- this.maxAn = this.dataList[i].maxNum
this.rowNum = i
this.eject()
},
@@ -458,7 +376,7 @@
combConfirm(type) {
this.msgType = type
this.title = '璀﹀憡'
- this.content = '鏄惁鐜板湪缁勬墭!'
+ this.content = '鏄惁鐜板湪骞舵墭!'
this.$refs.combConfirm.open()
},
combClose() {
@@ -467,11 +385,6 @@
comb() {
uni.vibrateShort();
let that = this;
- if (that.orderNo === '') {
- this.messageText = "璇疯緭鍏ヨ鍗曟潯鐮�"
- this.messageToggle('error')
- return;
- }
if (that.barcode === '') {
this.messageText = "璇锋壂鎻忔墭鐩樻潯鐮�"
this.messageToggle('error')
@@ -484,15 +397,14 @@
}
for (var i = 0; i < that.dataList.length; i++) {
if (that.dataList[i].anfme == 0 || that.dataList[i].anfme == '') {
- this.messageText = that.dataList[i].matnr + '缁勬墭鏁伴噺涓嶈兘涓�0'
+ this.messageText = that.dataList[i].matnr + '骞舵墭鏁伴噺涓嶈兘涓�0'
this.messageToggle('error')
return;
}
}
uni.request({
- url: that.baseUrl + '/mobile/merge/comb/auth',
+ url: that.baseUrl + '/mobile/combMeger/auth',
data: JSON.stringify({
- bomCode: that.orderNo,
barcode: that.barcode,
combMats: that.dataList
}),
@@ -504,7 +416,7 @@
var res = result.data
if (res.code === 200) {
that.resst();
- that.messageText = "缁勬墭鎴愬姛"
+ that.messageText = "骞舵墭鎴愬姛"
that.messageToggle('success')
const innerAudioContext = uni.createInnerAudioContext();
innerAudioContext.src = '/static/music/pakinOk.mp3';
@@ -542,15 +454,9 @@
},
// 娓呯┖
resst() {
- this.orderNo = ''
this.dataList = []
this.barcode = ''
- let that = this;
- that.orderNoFocus = false;
- setTimeout(() => {
- that.orderNo = '';
- that.orderNoFocus = true;
- }, 100);
+ this.barcodeFocuss()
},
}
}
@@ -562,7 +468,7 @@
.code {
width: 100%;
position: fixed;
- min-height: 140rpx;
+ min-height: 200rpx;
background-color: #FFF;
z-index: 10;
}
@@ -570,7 +476,7 @@
.item {
display: flex;
align-items: center;
- height: 70rpx;
+ height: 100rpx;
margin-left: 20rpx;
border-bottom: 1px solid #DCDFE6;
}
@@ -602,7 +508,7 @@
width: 100%;
background-color: white;
position: fixed;
- margin-top: 210rpx;
+ margin-top: 200rpx;
z-index: 9;
/* border-top: 1px solid #DCDFE6; */
text-align: center;
diff --git a/pages/pakin/mergeStore2.vue b/pages/pakin/mergeStore2.vue
new file mode 100644
index 0000000..edb9e4c
--- /dev/null
+++ b/pages/pakin/mergeStore2.vue
@@ -0,0 +1,611 @@
+<template>
+ <view>
+ <view class="code">
+ <view class="item">
+ <view class="code-decs">Bom鍙�:</view>
+ <view style="flex: 1;">
+ <input type="text" placeholder=" --" disabled="true" v-model="orderNo" :focus="orderNoFocus">
+ </view>
+ <view style="height:100%;line-height:2;width:40rpx;margin-right: 20rpx;">
+ <!-- <uni-icons type="clear" color="#c1c1c1" @click="clearOrderNo()"></uni-icons> -->
+ </view>
+ </view>
+ <view class="item">
+ <view class="code-decs">鎵樼洏鐮�:</view>
+ <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus"
+ @input="barcodeInput()">
+ </view>
+ <view class="item">
+ <view class="code-decs">鐗╂枡鐮�:</view>
+ <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="matnr" :focus="matFocus" @input="checkBom()">
+ <view class="item-right">
+ <button></button>
+ <text style="text-align: right;color: #409EFF;" @click="selectMat()">鎻愬彇+</text>
+ <uni-icons type="right" color="#c1c1c1"></uni-icons>
+ </view>
+ </view>
+ </view>
+ <view class="mat-list-title">
+ 鍟嗗搧鍒楄〃
+ </view>
+ <scroll-view>
+ <view class="list" v-for="(item,i) in dataList" :key="i">
+ <view class="list-left">
+ <view class="list-left-item">
+ <view class="desc">No锛�</view>
+ <view class="left-item">{{i + 1}}</view>
+ </view>
+ <view class="list-left-item">
+ <view class="desc">缂栫爜锛�</view>
+ <view class="left-item">
+ <uni-tag :text="item.matnr" type="primary"></uni-tag>
+ </view>
+ </view>
+ <view class="list-left-item">
+ <view class="desc">鍝佸悕锛�</view>
+ <view class="left-item">{{item.maktx}}</view>
+ </view>
+ <view class="list-left-item">
+ <view class="desc">瑙勬牸锛�</view>
+ <view class="left-item">{{item.specs}}</view>
+ </view>
+ <view class="list-left-item">
+ <view class="desc">鎵瑰彿锛�</view>
+ <view class="left-item">
+ <uni-tag :text="item.batch" type="warning"></uni-tag>
+ </view>
+ </view>
+ <!-- <view class="list-left-item">
+ <view class="desc">閲嶉噺锛�</view>
+ <view class="left-item">
+ <uni-tag :text="item.weight" type="warning"></uni-tag>
+ </view>
+ </view> -->
+ <view class="list-left-item">
+ <view class="left-item">鏁伴噺锛歿{item.anfme}}</view>
+ </view>
+ <view class="list-left-item">
+ </view>
+ </view>
+ <view class="list-right">
+ <uni-icons type="compose" color="#9add8b" size="24" @click="revise(item,i)"></uni-icons>
+ <uni-icons type="trash" color="#f58a8a" size="24" @click="remove(item,i,'warn')"></uni-icons>
+ </view>
+ </view>
+ </scroll-view>
+ <!-- 搴曢儴鎿嶄綔鎸夐挳 -->
+ <view class="buttom">
+ <button size="mini" @click="reset('warn')">閲嶇疆</button>
+ <button size="mini" type="primary" @click="combConfirm('warn')">缁勬墭</button>
+ </view>
+ <!-- 寮圭獥 -->
+ <!-- 淇敼鏁伴噺 -->
+ <view>
+ <uni-popup ref="revise" type="dialog">
+ <view class="popup">
+ <!-- 鏍囬 -->
+ <view class="title">淇敼</view>
+ <view class="popup-item">
+ <view class="popup-item-left">缂栫爜:</view>
+ <view class="popup-item-right">
+ <input type="text" v-model="matnr" disabled="true"
+ style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
+ </view>
+ </view>
+ <view class="popup-item">
+ <view class="popup-item-left">鎵瑰彿:</view>
+ <view class="popup-item-right"><input type="text" v-model="batch"></view>
+ </view>
+ <!-- <view class="popup-item">
+ <view class="popup-item-left">閲嶉噺:</view>
+ <view class="popup-item-right"><input type="text" v-model="weight"></view>
+ </view> -->
+ <view class="popup-item">
+ <view class="popup-item-left">鏁伴噺:</view>
+ <view class="popup-item-right" style="border: none;justify-content: center;">
+ <uni-number-box :value="count" :step='1' :max="maxAn" color="#747474" @change="changeValue" />
+ </view>
+ </view>
+ <view class="btn">
+ <view class="btn-left" @click="reviseClose">鍙栨秷</view>
+ <view class="btn-right" @click="reviseConfirm()">淇敼</view>
+ </view>
+ </view>
+ </uni-popup>
+ </view>
+ <!-- 绉婚櫎纭 -->
+ <view>
+ <!-- 鎻愮ず绐楃ず渚� -->
+ <uni-popup ref="alertDialog" type="dialog">
+ <uni-popup-dialog :type="msgType" confirmText="绉婚櫎" :title="title" :content="content"
+ @confirm="removeConfirm()" @close="removeClose"></uni-popup-dialog>
+ </uni-popup>
+ </view>
+ <view>
+ <!-- 鎻愮ず淇℃伅寮圭獥 -->
+ <uni-popup ref="message" type="message">
+ <uni-popup-message :type="msgType1" :message="messageText" :duration="2000"></uni-popup-message>
+ </uni-popup>
+ </view>
+ <!-- 纭缁勬墭 -->
+ <view>
+ <uni-popup ref="combConfirm" type="dialog">
+ <uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
+ @confirm="comb" @close="combClose"></uni-popup-dialog>
+ </uni-popup>
+ </view>
+ <!-- 纭閲嶇疆 -->
+ <view>
+ <uni-popup ref="resetConfirm" type="dialog">
+ <uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
+ @confirm="resetConfirm" @close="resetClose"></uni-popup-dialog>
+ </uni-popup>
+ </view>
+ </view>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+ baseUrl: '',
+ token: '',
+ barcode: '',
+ orderNo: '',
+ dataList: [],
+ count: 0,
+ rowNum: '',
+ matnr: '',
+ batch: '',
+ weight: '',
+ msgType1: 'success',
+ msgType: 'success',
+ messageText: '',
+ title: '',
+ content: '',
+ orderNoFocus: false,
+ barcodeFocus: true,
+ matFocus: false,
+ matData: '',
+ removeNum: 0,
+ enterCount: 0,
+ maxAnfme: 0,
+ maxAn: 0
+ }
+ },
+ onLoad() {
+
+ },
+ onShow() {
+ this.baseUrl = uni.getStorageSync('baseUrl');
+ this.token = uni.getStorageSync('token');
+ },
+ methods: {
+ messageToggle(type) {
+ this.msgType1 = type
+ this.$refs.message.open()
+ },
+ clearOrderNo() {
+ this.orderNo = ''
+ let that = this;
+ that.orderNoFocus = false;
+ setTimeout(() => {
+ that.orderNo = '';
+ that.orderNoFocus = true;
+ }, 100);
+ },
+ orderNoInput() {
+ // 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
+ setTimeout(() => {
+ var len = this.orderNo.length
+ this.barcodeFocuss()
+ }, 200)
+ },
+ // barcode input 浜嬩欢
+ barcodeInput() {
+ let _this = this
+ uni.request({
+ url: _this.baseUrl + '/mobile/check/mergeStore/barcode',
+ data: {barcode: _this.barcode},
+ header: { 'token':uni.getStorageSync('token') },
+ success(res) {
+ res = res.data
+ if (res.code === 200) {
+ _this.focuss()
+ _this.orderNo = res.data
+ uni.showToast({ title: '鎿嶄綔鎴愬姛', icon: "none", position: 'top' })
+ } else if (res.code === 403) {
+ uni.showToast({ title: res.msg, icon: "none", position: 'top' })
+ setTimeout(() => {
+ uni.reLaunch({ url: '../login/login' });
+ }, 1000);
+ } else {
+ _this.barcodeFocuss()
+ uni.showToast({ title: res.msg, icon: "none", position: 'top' })
+ }
+ }
+ })
+ },
+ // 鎵樼洏鐮佹湁璇噸缃�
+ barcodeFocuss() {
+ let that = this;
+ that.barcodeFocus = false;
+ setTimeout(() => {
+ that.barcode = '';
+ that.barcodeFocus = true;
+ }, 100);
+ },
+ // 鍟嗗搧鍏夋爣娓呯┖閲嶇疆
+ focuss() {
+ this.focus = false;
+ setTimeout(() => {
+ this.matnr = '';
+ this.matFocus = true;
+ }, 100);
+ },
+ // 妫�楠屽綋鍓嶇墿鏂欐槸鍚︽槸鍦ㄥ綋鍓岯om琛ㄤ腑
+ checkBom() {
+ let _this = this
+ uni.request({
+ url: _this.baseUrl + '/mobile/comb/checkBom',
+ data: JSON.stringify({
+ bomCode: _this.orderNo,
+ matnr: _this.matnr
+ }),
+ method: 'POST',
+ header: { 'token': uni.getStorageSync('token') },
+ success(res) {
+ // console.log(res);
+ res = res.data
+ if (res.code === 200) {
+ if (res.data) {
+ _this.maxAnfme = res.data.zpalletAnfme
+ _this.findMat()
+ } else {
+ _this.findMat()
+ }
+ } else if (res.code == 403) {
+ uni.showToast({
+ title: res.msg,
+ icon: "none",
+ position: 'top'
+ })
+ setTimeout(() => {
+ uni.reLaunch({
+ url: '../login/login'
+ });
+ }, 1000);
+ } else {
+ _this.matnr = ''
+ uni.showToast({
+ title: res.msg,
+ icon: "none",
+ position: 'top'
+ })
+ }
+
+ }
+ })
+ },
+ // 鎼滅储鐗╂枡
+ findMat() {
+ let that = this
+ uni.request({
+ url: that.baseUrl + '/mat/auth',
+ data: {
+ matnr: that.matnr
+ },
+ header: {
+ 'token': uni.getStorageSync('token')
+ },
+ success(result) {
+ result = result.data
+ if (result.code === 200 && result.data) {
+ that.matData = result.data
+ that.matnr = ''
+ that.matData['batch'] = ''
+ if (that.maxAnfme > 0) {
+ that.matData['maxNum'] = that.maxAnfme
+ } else if (that.maxAnfme == 0){
+ that.matData['maxNum'] = 0
+ }
+ uni.navigateTo({
+ url: "../mat/matSelected",
+ // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
+ success: function(res) {
+ res.eventChannel.emit('mat', {
+ data: result.data
+ })
+ },
+ // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
+ events: {
+ matList: function(data) {
+ console.log(data);
+ that.checkMat(data.data)
+ that.focuss()
+ },
+ },
+ });
+ } else if (result.code == 403) {
+ uni.showToast({
+ title: result.msg,
+ icon: "none",
+ position: 'top'
+ })
+ setTimeout(() => {
+ uni.reLaunch({
+ url: '../login/login'
+ });
+ }, 1000);
+ } else {
+ uni.showToast({
+ title: result.msg,
+ icon: "none",
+ position: 'top'
+ })
+ }
+
+ }
+ });
+
+ },
+ selectMat() {
+ let that = this
+ uni.navigateTo({
+ url: "../mat/matQuery",
+ success: function(res) {
+ // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
+ res.eventChannel.emit('commonUrl', {
+ commonUrl: ''
+ })
+ },
+ events: {
+ // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨�
+ acceptDataFromOpenedPage: function(data) {
+ that.matnr = data.data
+ that.findMat(that.matnr)
+ },
+ },
+
+
+ });
+ that.matnr = ''
+ },
+ checkMat(mat) {
+ var len = this.dataList.length
+ var add = true ,sameItem = false
+ for (var i = 0; i < len; i++) {
+ if (mat.matnr == this.dataList[i].matnr) {
+ for (var j = 0; j < len; j++) {
+ if (mat.batch == this.dataList[j].batch) {
+ sameItem = true
+ }
+ }
+ // 鐩稿悓鐗╂枡 涓嶅悓鎵瑰彿 鏂板姞鍒楄〃
+ if (mat.batch != this.dataList[i].batch) {
+ this.$forceUpdate() // 寮哄埗鍒锋柊
+ if (sameItem) {
+ add = false
+ } else {
+ add = true
+ }
+
+ } else {
+ // 鐩稿悓鐗╂枡鐩稿悓鎵瑰彿 鏁伴噺绱姞
+ this.dataList[i].anfme += mat.anfme
+ this.$forceUpdate() // 寮哄埗鍒锋柊
+ add = false
+ }
+ }
+ }
+ if (add) {
+ // if (this.maxAnfme) {
+ // mat['maxAnfme'] = this.maxAnfme
+ // mat.anfme = this.maxAnfme
+
+ // }
+ this.dataList.unshift(mat)
+ }
+ this.maxAnfme = ''
+ },
+ // 淇敼鎵瑰彿
+ revise(item, i) {
+ this.matnr = this.dataList[i].matnr
+ this.count = this.dataList[i].anfme
+ this.batch = this.dataList[i].batch
+ this.weight = this.dataList[i].weight
+ this.maxAn = this.dataList[i].maxNum
+ this.rowNum = i
+ this.eject()
+ },
+ eject(type) {
+ this.type = type
+ this.$refs.revise.open(type)
+ },
+ // 鍒楄〃绉婚櫎鎸夐挳
+ remove(item, i, type) {
+ this.removeNum = i
+ this.msgType = type
+ this.title = '璀﹀憡'
+ this.content = '鏄惁绉婚櫎褰撳墠鍟嗗搧!'
+ this.$refs.alertDialog.open(i)
+ },
+ // 纭绉婚櫎
+ removeConfirm() {
+ this.messageText = "绉婚櫎鎴愬姛"
+ this.messageToggle('success')
+ this.dataList.splice(this.removeNum, 1)
+ },
+ // 鍙栨秷绉婚櫎
+ removeClose() {
+ this.$refs.alertDialog.close()
+ },
+ reviseConfirm() {
+ this.dataList[this.rowNum].anfme = this.count
+ this.dataList[this.rowNum].batch = this.batch
+ this.dataList[this.rowNum].weight = this.weight
+ this.matnr = ''
+ this.messageText = "淇敼鎴愬姛"
+ this.messageToggle('success')
+ this.$refs.revise.close()
+ },
+ reviseClose() {
+ this.$refs.revise.close()
+ },
+ changeValue(value) {
+ this.count = value
+ },
+ combConfirm(type) {
+ this.msgType = type
+ this.title = '璀﹀憡'
+ this.content = '鏄惁鐜板湪缁勬墭!'
+ this.$refs.combConfirm.open()
+ },
+ combClose() {
+ this.$refs.combConfirm.close()
+ },
+ comb() {
+ uni.vibrateShort();
+ let that = this;
+ if (that.orderNo === '') {
+ this.messageText = "璇疯緭鍏ヨ鍗曟潯鐮�"
+ this.messageToggle('error')
+ return;
+ }
+ if (that.barcode === '') {
+ this.messageText = "璇锋壂鎻忔墭鐩樻潯鐮�"
+ this.messageToggle('error')
+ return;
+ }
+ if (that.dataList.length === 0) {
+ this.messageText = "璇锋坊鍔犲晢鍝佸垪琛�"
+ this.messageToggle('error')
+ return;
+ }
+ for (var i = 0; i < that.dataList.length; i++) {
+ if (that.dataList[i].anfme == 0 || that.dataList[i].anfme == '') {
+ this.messageText = that.dataList[i].matnr + '缁勬墭鏁伴噺涓嶈兘涓�0'
+ this.messageToggle('error')
+ return;
+ }
+ }
+ uni.request({
+ url: that.baseUrl + '/mobile/merge/comb/auth',
+ data: JSON.stringify({
+ bomCode: that.orderNo,
+ barcode: that.barcode,
+ combMats: that.dataList
+ }),
+ method: 'POST',
+ header: {
+ 'token': uni.getStorageSync('token')
+ },
+ success(result) {
+ var res = result.data
+ if (res.code === 200) {
+ that.resst();
+ that.messageText = "缁勬墭鎴愬姛"
+ that.messageToggle('success')
+ const innerAudioContext = uni.createInnerAudioContext();
+ innerAudioContext.src = '/static/music/pakinOk.mp3';
+ innerAudioContext.play()
+ } else if (res.code == 403) {
+ that.messageText = res.msg
+ that.messageToggle('error')
+ setTimeout(() => {
+ uni.reLaunch({
+ url: '../login/login'
+ });
+ }, 1000);
+ } else {
+ that.messageText = res.msg
+ that.messageToggle('error')
+ }
+ }
+ });
+ },
+ reset(type) {
+ this.msgType = type
+ this.title = '璀﹀憡'
+ this.content = '鏄惁閲嶇疆!'
+ this.$refs.resetConfirm.open()
+ },
+ // 纭閲嶇疆
+ resetConfirm() {
+ this.dataList = []
+ this.messageText = "閲嶇疆瀹屾垚"
+ this.messageToggle('success')
+ },
+ // 鍙栨秷閲嶇疆
+ resetClose() {
+
+ },
+ // 娓呯┖
+ resst() {
+ this.orderNo = ''
+ this.dataList = []
+ this.barcode = ''
+ let that = this;
+ that.orderNoFocus = false;
+ setTimeout(() => {
+ that.orderNo = '';
+ that.orderNoFocus = true;
+ }, 100);
+ },
+ }
+ }
+</script>
+
+<style>
+ @import url('../../static/css/wms.css/wms.css');
+
+ .code {
+ width: 100%;
+ position: fixed;
+ min-height: 140rpx;
+ background-color: #FFF;
+ z-index: 10;
+ }
+
+ .item {
+ display: flex;
+ align-items: center;
+ height: 70rpx;
+ margin-left: 20rpx;
+ border-bottom: 1px solid #DCDFE6;
+ }
+
+ .item input {
+ height: 50rpx;
+ line-height: 50rpx;
+ /* font-family: PingFang SC; uniapp 榛樿瀛椾綋涓嶅眳涓� */
+ font-size: 36upx;
+ font-family: PingFang SC;
+ width: 55vw;
+
+ }
+
+ .code-decs {
+ width: 20vw;
+ font-size: 18px;
+ color: #303133;
+ }
+
+ .item-right {
+ margin-left: auto;
+ margin-right: 20rpx;
+ }
+
+ .mat-list-title {
+ height: 80rpx;
+ line-height: 80rpx;
+ width: 100%;
+ background-color: white;
+ position: fixed;
+ margin-top: 210rpx;
+ z-index: 9;
+ /* border-top: 1px solid #DCDFE6; */
+ text-align: center;
+ box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.2);
+ }
+</style>
diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index 25b3330..6fc7fc9 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -83,8 +83,8 @@
</view>
</view>
<view class="popup-item">
- <view class="popup-item-left" style="width: 20vw;">鎯呭喌璇存槑:</view>
- <view class="popup-item-right" style="width: 46vw;"><input type="text" v-model="batch"></view>
+ <view class="popup-item-left" style="width: 20vw;">澶囨敞:</view>
+ <view class="popup-item-right" style="width: 46vw;"><input type="text" v-model="memo"></view>
</view>
<!-- <view class="popup-item">
<view class="popup-item-left">閲嶉噺:</view>
@@ -141,6 +141,7 @@
baseUrl: '',
token: '',
barcode: '',
+ mome: '',
dataList: [],
count: 0,
rowNum: '',
@@ -330,6 +331,7 @@
this.matnr = this.dataList[i].matnr
this.count = this.dataList[i].anfme
this.batch = this.dataList[i].batch
+ this.memo = this.dataList[i].memo
this.weight = this.dataList[i].weight
this.rowNum = i
this.eject()
--
Gitblit v1.9.1