From e7de9d5191399fc03b9905684282dfd0dd429f84 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 26 十月 2023 13:46:12 +0800
Subject: [PATCH] #
---
pages/home/home.vue | 7
pages/tzsk/AGV/AGVPick.vue | 9
pages/tzsk/pakin/locPick.vue | 27 +-
pages.json | 9
pages/tzsk/pakin/checkOut.vue | 513 +++++++++++++++++++++++++++++++++++++++++++++++++++
5 files changed, 550 insertions(+), 15 deletions(-)
diff --git a/pages.json b/pages.json
index bec8ce9..8630820 100644
--- a/pages.json
+++ b/pages.json
@@ -239,6 +239,15 @@
}
}
+ ,{
+ "path" : "pages/tzsk/pakin/checkOut",
+ "style" :
+ {
+ "navigationBarTitleText": "鍑哄簱鎷ｉ��",
+ "enablePullDownRefresh": false
+ }
+
+ }
],
"globalStyle": {
"navigationBarTextStyle": "black",
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 65558f2..c9364f0 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -83,6 +83,13 @@
url: '/tzsk/order/orderPutOn'
},
{
+ title: '鍑哄簱鎷ｉ��',
+ name: 'checkOut',
+ color: 'cyan',
+ // cuIcon: 'pullup',
+ url: '/tzsk/pakin/checkOut'
+ },
+ {
title: '璁㈠崟涓婃灦',
name: 'orderPutOn',
color: 'yellow',
diff --git a/pages/tzsk/AGV/AGVPick.vue b/pages/tzsk/AGV/AGVPick.vue
index e8f71c8..437f835 100644
--- a/pages/tzsk/AGV/AGVPick.vue
+++ b/pages/tzsk/AGV/AGVPick.vue
@@ -163,8 +163,6 @@
methods: {
containerPick() {
let _this = this
- this.devNo = []
- uni.vibrateShort();
for (var i = 0; i < this.dataList.length; i++) {
if (this.dataList[i].checked) {
this.devNo.push(this.dataList[i].devNo)
@@ -180,6 +178,8 @@
console.log(res);
if (res.code === 200) {
_this.pickCode = ''
+ _this.dataList = []
+ _this.devNo = []
_this.messageText = "鐩樼偣 / 鎷ｈ揣鎴愬姛"
_this.messageToggle('success')
} else if (res.code == 403) {
@@ -206,14 +206,11 @@
// 瀹瑰櫒绂诲満
containerMove() {
let _this = this
- this.devNo = []
- uni.vibrateShort();
for (var i = 0; i < this.dataList.length; i++) {
if (this.dataList[i].checked) {
this.devNo.push(this.dataList[i].devNo)
}
}
- var param = {'devNo' : _this.pickCode}
uni.request({
url: _this.baseUrl + '/agv/basDevp/visualized/container/moveOut',
header: {'token': uni.getStorageSync('token')},
@@ -224,6 +221,8 @@
console.log(res);
if (res.code === 200) {
_this.pickCode = ''
+ _this.dataList = []
+ _this.devNo = []
_this.messageText = "绂诲満鎴愬姛"
_this.messageToggle('success')
} else if (res.code == 403) {
diff --git a/pages/tzsk/pakin/checkOut.vue b/pages/tzsk/pakin/checkOut.vue
new file mode 100644
index 0000000..ec65b94
--- /dev/null
+++ b/pages/tzsk/pakin/checkOut.vue
@@ -0,0 +1,513 @@
+<template>
+ <view>
+ <view class="code">
+ <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="pickCode" :focus="pickCodeFocus"
+ @input="pickCodeInput()">
+ </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">
+ <input type="text" v-model="item.containerCode" @input="checkContainerCode(item)">
+ <!-- <uni-tag :text="item.containerCode" type="primary"></uni-tag> -->
+ </view>
+ </view>
+ <!-- <view class="list-left-item">
+ <view class="desc">閿�鍞崟鍙凤細</view>
+ <view class="left-item">
+ <input type="text" v-model="item.csocode">
+ -- <uni-tag :text="item.containerCode" type="primary"></uni-tag>
+ </view>
+ </view> -->
+ <!-- <view class="list-left-item">
+ <view class="desc">璁㈠崟琛屽彿锛�</view>
+ <view class="left-item">
+ <input type="text" v-model="item.isoseq">
+ -- <uni-tag :text="item.containerCode" type="primary"></uni-tag>
+ </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="desc">鏁伴噺锛�</view>
+ <view class="left-item">{{item.anfme}}</view>
+ </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='0.01' :max="9999999" 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="add" 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="pickCode" 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" style="border: none;justify-content: center;">
+ <uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474" @change="changeValue" />
+ </view>
+ </view>
+ <view class="btn">
+ <view class="btn-left" @click="addClose">鍙栨秷</view>
+ <view class="btn-right" @click="addConfirm()">纭</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 class="keyboard" :class="hidebg" mode="aspectFit" @click="hideKeyboard">
+ <image src="@/static/img/keyboard1.png" style="height: 70%;width: 70%;"></image>
+ </view>
+ </view>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+ baseUrl: '',
+ token: '',
+ barcode: '',
+ orderNo: '',
+ pickCode: '',
+ pickCodeFocus: '',
+ dataList: [],
+ count: 0,
+ rowNum: '',
+ matnr: '',
+ batch: '',
+ weight: '',
+ msgType1: 'success',
+ msgType: 'success',
+ messageText: '',
+ title: '',
+ content: '',
+ barcodeFocus: true,
+ matData: '',
+ removeNum: 0,
+ tempOrderInfo: {csocode: '',isoseq: ''},
+ hide: true,
+ hidebg: 'kb-bgtr'
+ }
+ },
+ onLoad() {
+ // #ifdef APP
+ setInterval(()=>{
+ if (this.hide) {
+ uni.hideKeyboard()
+ } else {
+
+ }
+ },20)
+ // #endif
+ },
+ onBackPress() {
+ this.hide = false
+ },
+ onShow() {
+ this.baseUrl = uni.getStorageSync('baseUrl');
+ this.token = uni.getStorageSync('token');
+ },
+ methods: {
+ hideKeyboard() {
+ this.hide = this.hide ? false : true
+ if (this.hide) {
+ this.hidebg = 'kb-bgtr'
+ } else {
+ this.hidebg = 'kb-bgfa'
+ }
+ },
+ // 杩囨护
+ checkContainerCode(item) {
+ item.containerCode = item.containerCode.split('_')[1]
+ // this.barcode = this.barcode.split('_')[1]
+ },
+ messageToggle(type) {
+ this.msgType1 = type
+ this.$refs.message.open()
+ },
+ // barcode input 浜嬩欢
+ barcodeInput() {
+ let _this = this
+ uni.request({
+ url: `${_this.baseUrl}`,
+ data: { barcode: _this.barcode },
+ header: { 'token': uni.getStorageSync('token') },
+ success(res) {
+ res = res.data
+ if (res.code === 200) {
+ _this.barcodeFocus = false;
+ setTimeout(() => {
+ _this.pickCodeFocus = true;
+ }, 100);
+ } else {
+ _this.messageText = "鏆傛棤鎷ｆ枡淇℃伅"
+ _this.messageToggle('warn')
+ _this.barcodeFocus = false;
+ setTimeout(() => {
+ _this.barcode = '';
+ _this.barcodeFocus = true;
+ }, 100);
+ }
+ }
+ })
+ },
+ pickCodeInput() {
+ this.pickCode = this.pickCode.split('_')[1] ? this.pickCode.split('_')[1] : this.pickCode.split('_')[0]
+ for (let k of this.dataList) {
+ if (this.pickCode == k.containerCode) {
+ this.messageText = "鏉＄爜閲嶅"
+ this.messageToggle('warn')
+ this.pickCodeFocus = false;
+ setTimeout(() => {
+ this.pickCode = ''
+ this.pickCodeFocus = true;
+ }, 100);
+ return
+ }
+ }
+ this.add()
+ },
+ add() {
+ this.$refs.add.open()
+ },
+ addConfirm() {
+ let data = {containerCode: this.pickCode,anfme: this.count}
+ this.dataList.push(data)
+ this.pickCodeFocus = false;
+ setTimeout(() => {
+ this.pickCode = ''
+ this.count = ''
+ this.pickCodeFocus = true;
+ }, 100);
+
+ this.$refs.add.close()
+ },
+ addClose() {
+
+ this.pickCodeFocus = false;
+ setTimeout(() => {
+ this.pickCode = ''
+ this.count = ''
+ this.pickCodeFocus = true;
+ }, 100);
+ // this.pickCode = ''
+ this.$refs.add.close()
+ },
+ // 淇敼鎵瑰彿
+ 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.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.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;
+ }
+ }
+ // console.log(that.dataList);
+ // return
+ uni.request({
+ url: that.baseUrl + '/mobile/comb/auth',
+ data: JSON.stringify({
+ 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.barcode = ''
+ this.pickCode = ''
+ this.messageText = "閲嶇疆瀹屾垚"
+ this.messageToggle('success')
+ },
+ // 鍙栨秷閲嶇疆
+ resetClose() {
+
+ },
+ // 娓呯┖
+ resst() {
+ this.dataList = []
+ this.barcode = ''
+ this.orderNo = ''
+ this.pickCode = ''
+ this.barcodeFocuss()
+ },
+ }
+ }
+</script>
+
+<style>
+ @import url('../../../static/css/wms.css/wms.css');
+
+ .list:first-child {
+ margin-top: 320rpx;
+ }
+ .code {
+ width: 100%;
+ position: fixed;
+ min-height: 70rpx;
+ 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: 140rpx;
+ 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/tzsk/pakin/locPick.vue b/pages/tzsk/pakin/locPick.vue
index 7dfa4da..21c858a 100644
--- a/pages/tzsk/pakin/locPick.vue
+++ b/pages/tzsk/pakin/locPick.vue
@@ -26,15 +26,15 @@
</view>
<view class="sub2" v-for="it in sub.children" style="margin-left: 1em;" v-show="sub.switch">
- <view :class="it.key" class="title sub-title" >{{it.title}}</view>
- <view :class="it.key" class="name" v-show="it.key == 'user_id'" @click="back()">
+ <!-- <view :class="it.key" class="title sub-title" >{{it.title}}</view> -->
+ <view :class="it.key" class="locarea name" @click="chose(it)">
<view>{{it.title}}</view>
</view>
</view>
</view>
</view>
</view>
-
+ <view style="height: 100rpx;"></view>
</view>
</template>
@@ -63,18 +63,18 @@
// console.log(res.data[0].children);
if (res.data[0].children[0]) {
for (let k of res.data[0].children) {
- console.log(k);
+ // console.log(k);
if (k.children && k.children.length > 0) {
for (let i of k.children) {
i['switch'] = true
- console.log(i);
+ // console.log(i);
}
}
// console.log(k);
k['switch'] = true
_this.tree.push(k)
}
- console.log(_this.tree);
+ // console.log(_this.tree);
} else {
this.tree.push(res.data[0])
}
@@ -85,14 +85,14 @@
let res = await user.getUserTree()
if (res.code === 200) {
this.tree = []
- console.log(res.data[0]);
+ // console.log(res.data[0]);
if (res.data[0].children) {
for (let k of res.data[0].children) {
if (k.children && k.children.length > 0) {
for (let i of k.children) {
i['switch'] = true
- console.log(i);
+ // console.log(i);
}
}
// console.log(k);
@@ -108,7 +108,7 @@
console.log(this.tree);
},
switchbtn(item) {
- console.log(item);
+ // console.log(item);
item.switch = item.switch ? false : true
},
open(e) {
@@ -133,7 +133,12 @@
uni.navigateBack({
})
+ },
+ chose(data) {
+ console.log(data);
+ this.tree = []
}
+
}
}
</script>
@@ -167,5 +172,7 @@
justify-content: space-between;
align-items: center;
}
-
+ .locarea:active {
+ background-color: #55aa7f;
+ }
</style>
\ No newline at end of file
--
Gitblit v1.9.1