From 4bfbbe389310fdea9b140e3551c116db85c63249 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 29 三月 2024 10:59:55 +0800
Subject: [PATCH] #
---
pages/phyz/AGV/emptyOut.vue | 632 ++++++++++++++++++++++++++++++++++++++++++++++++++++
pages/phyz/AGV/emptyPakin.vue | 31 +-
pages.json | 9
pages/home/inOutManage.vue | 7
pages/phyz/AGV/AGVPakin3.vue | 27 +
pages/tzsk/AGV/AGVStart.vue | 2
6 files changed, 684 insertions(+), 24 deletions(-)
diff --git a/pages.json b/pages.json
index db1793c..4dc6d73 100644
--- a/pages.json
+++ b/pages.json
@@ -526,6 +526,15 @@
+ ,{
+ "path" : "pages/phyz/AGV/emptyOut",
+ "style" :
+ {
+ "navigationBarTitleText": "鍛煎彨绌鸿揣鏋�",
+ "enablePullDownRefresh": false
+ }
+
+ }
],
"globalStyle": {
"navigationBarTextStyle": "black",
diff --git a/pages/home/inOutManage.vue b/pages/home/inOutManage.vue
index 3f6b9f7..90b3bed 100644
--- a/pages/home/inOutManage.vue
+++ b/pages/home/inOutManage.vue
@@ -33,6 +33,13 @@
url: `/phyz/AGV/emptyPakin`
},
{
+ title: '鍛煎彨绌鸿揣鏋�',
+ name: 'emptyOut',
+ color: 'blue',
+ // cuIcon: 'pullup',
+ url: `/phyz/AGV/emptyOut`
+ },
+ {
title: '缁勬墭',
name: 'pakin',
color: 'blue',
diff --git a/pages/phyz/AGV/AGVPakin3.vue b/pages/phyz/AGV/AGVPakin3.vue
index 734819b..402ff55 100644
--- a/pages/phyz/AGV/AGVPakin3.vue
+++ b/pages/phyz/AGV/AGVPakin3.vue
@@ -9,7 +9,7 @@
<input type="text" placeholder=" 鎵爜 / 杈撳叆 璐ф灦鐮�" v-model="barcode" :focus="barcodeFocus"
@input="barcodeInput()">
</view>
- <view class="item">
+ <!-- <view class="item">
<view class="dropdown" @click="toggleDropdown()">
<input type="text" style="width: 650rpx;" v-model="containerType" placeholder="璇烽�夋嫨璐ф灦绫诲瀷">
<uni-icons :type="isOpen ? 'top' : 'bottom'" color="#c1c1c1" style="margin-left: 10rpx;"></uni-icons>
@@ -17,7 +17,7 @@
<view class="dropdown-item" v-for="option in selects" @click="selected(option)">{{option}}</view>
</scroll-view>
</view>
- </view>
+ </view> -->
<view class="item">
<input type="text" placeholder=" 鎵爜 / 杈撳叆 鏆傚瓨浣�" v-model="stationCode" :focus="stationCodeFocus"
@input="stationCodeInput()">
@@ -286,7 +286,7 @@
stationCodeInput() {
setTimeout(() => {
var len = this.stationCode.length
- if (len != 15) {
+ if (len != 7) {
this.stationCode = ''
this.stationCodeFocus = true
uni.showToast({
@@ -308,13 +308,19 @@
}, 200)
},
barcodeInput() {
- // 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
- if (this.barcode.split('_')[1]) {
- this.barcode = this.barcode.split('_')[1]
- }
+ let val = this.barcode.substring(0,2)
+ if (val == '10') {
+ this.containerType = 1
+ } else if(val == '20') {
+ this.containerType = 2
+ } else if (val == '21') {
+ this.containerType = 3
+ } else if (val == '30') {
+ this.containerType = 4
+ }
setTimeout(() => {
var len = this.barcode.length
- if (len != 10) {
+ if (len != 6) {
this.barcode = ''
this.barcodeFocus = true
uni.showToast({
@@ -553,6 +559,7 @@
orderNo: that.orderNo,
barcode: that.barcode,
locno: that.stationCode,
+ // containerType: this.containerType,
combMats: that.dataList
}),
method: 'POST',
@@ -645,7 +652,7 @@
let param = {
devNo: this.stationCode,
containerCode: this.barcode,
- containerType: this.containerType,
+ // containerType: this.containerType,
}
params.push(param)
} else {
@@ -736,7 +743,7 @@
width: 100%;
background-color: white;
position: fixed;
- margin-top: 280rpx;
+ margin-top: 210rpx;
z-index: 9;
/* border-top: 1px solid #DCDFE6; */
text-align: center;
diff --git a/pages/phyz/AGV/emptyOut.vue b/pages/phyz/AGV/emptyOut.vue
new file mode 100644
index 0000000..257bed5
--- /dev/null
+++ b/pages/phyz/AGV/emptyOut.vue
@@ -0,0 +1,632 @@
+<template>
+ <view>
+ <view class="code">
+ <view class="item">
+ <input type="text" placeholder=" 鎵爜 / 杈撳叆 鏆傚瓨浣�" v-model="stationCode" :focus="stationCodeFocus"
+ @input="stationCodeInput()" readonly>
+ <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 class="item">
+ <view class="dropdown" @click="toggleDropdown()">
+ <input type="text" style="width: 650rpx;" v-model="containerType" placeholder="璇烽�夋嫨璐ф灦绫诲瀷">
+ <uni-icons :type="isOpen ? 'top' : 'bottom'" color="#c1c1c1" style="margin-left: 10rpx;"></uni-icons>
+ <scroll-view scroll-y="ture" class="dropdown-content" v-if="isOpen">
+ <view class="dropdown-item" v-for="option in selects" @click="selected(option)">{{option}}</view>
+ </scroll-view>
+ </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">宸ヤ綔绔欑紪鍙凤細</view>
+ <view class="left-item">
+ <uni-tag :text="item.stationCode" type="primary"></uni-tag>
+ </view>
+ </view>
+ <view class="list-left-item">
+ <view class="desc">宸ヤ綔浣嶇紪鍙凤細</view>
+ <view class="left-item">{{item.devNo}}</view>
+ </view>
+ <view class="list-left-item">
+ <view class="desc">璐т綅鐘舵�侊細</view>
+ <view class="left-item">{{item.locSts$}}</view>
+ </view>
+ <view class="list-left-item">
+ <view class="desc">鏉″舰鐮侊細</view>
+ <view class="left-item">
+ <uni-tag :text="item.barcode" type="warning"></uni-tag>
+ </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','pakout')">鍑哄簱</button>
+ <!-- <button size="mini" type="primary" @click="combConfirm('warn','pakin')">鍏ュ簱</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="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: '',
+ stationCode: '',
+ stationCodeFocus: false,
+ dataList: [],
+ count: 0,
+ rowNum: '',
+ matnr: '',
+ batch: '',
+ weight: '',
+ msgType1: 'success',
+ msgType: 'success',
+ messageText: '',
+ title: '',
+ content: '',
+ barcodeFocus: true,
+ matFocus: false,
+ matData: '',
+ removeNum: 0,
+ hide: true,
+ hidebg: 'kb-bgtr',
+ kind: '',
+ containerType: '',
+ selects: [123],
+ option: '',
+ isOpen: false
+ }
+ },
+ 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: {
+ getContainerType() {
+ let _this = this
+ uni.request({
+ url: `${_this.baseUrl}/agvMobile/pakout/empty/container/selector/auth`,
+ header: {'token': uni.getStorageSync('token')},
+ data: JSON.stringify({devNo: this.stationCode}),
+ method: 'POST',
+ success(res) {
+ res = res.data
+ if (res.code === 200) {
+ _this.selects = res.data
+ }
+ console.log(res);
+ }
+ })
+ },
+ toggleDropdown() {
+ this.isOpen = !this.isOpen
+ },
+ selected(option) {
+ this.containerType = option
+ },
+ hideKeyboard() {
+ this.hide = this.hide ? false : true
+ if (this.hide) {
+ this.hidebg = 'kb-bgtr'
+ } else {
+ this.hidebg = 'kb-bgfa'
+ }
+ },
+ messageToggle(type) {
+ this.msgType1 = type
+ this.$refs.message.open()
+ },
+ stationCodeInput() {
+ setTimeout(() => {
+ var len = this.stationCode.length
+ if (len != 7) {
+ this.stationCode = ''
+ this.stationCodeFocus = true
+ uni.showToast({
+ title: '鏆傚瓨鐮佹湁璇閲嶈瘯',
+ icon: "none",
+ position: 'top'
+ });
+ return;
+ }
+ this.getBasDevp(this.stationCode)
+ this.getContainerType()
+ }, 200)
+ },
+ // 鑾峰彇鏆傚瓨浣�
+ getBasDevp(devNo) {
+ let _this = this
+ uni.request({
+ url: `${_this.baseUrl}/agv/basDevp/list/auth`,
+ header: {'token': uni.getStorageSync('token')},
+ data: {
+ curr: 1,
+ limit: 1000,
+ dev_no: devNo
+ },
+ method: 'GET',
+ success(res) {
+ res = res.data
+ if (res.code === 200) {
+ _this.dataList = res.data.records
+ }
+ }
+ })
+ },
+ // barcode input 浜嬩欢
+ barcodeInput() {
+ let val = this.barcode.substring(0,2)
+ if (val == '10') {
+ this.containerType = 1
+ } else if(val == '20') {
+ this.containerType = 2
+ } else if (val == '21') {
+ this.containerType = 3
+ } else if (val == '30') {
+ this.containerType = 4
+ }
+ setTimeout(() => {
+ var len = this.barcode.length
+ if (len != 6) {
+ uni.showToast({
+ title: '鏂欑鐮佹湁璇閲嶈瘯',
+ icon: "none",
+ position: 'top'
+ });
+ this.barcodeFocuss()
+ return;
+ }
+ this.stationCodeFocuss()
+ }, 200)
+ },
+ // 鏆傚瓨浣嶆湁璇噸缃�
+ stationCodeFocuss() {
+ let that = this;
+ that.stationCodeFocus = false;
+ setTimeout(() => {
+ that.stationCodeFocus = true;
+ }, 100);
+ },
+ // 鏂欑鐮佹湁璇噸缃�
+ 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);
+ },
+ // 鎼滅储鐗╂枡
+ 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'] = ''
+ uni.navigateTo({
+ url: "../mat/matSelected",
+ // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
+ success: function(res) {
+ res.eventChannel.emit('mat', {
+ data: result.data
+ })
+ },
+ // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
+ events: {
+ matList: function(data) {
+ that.checkMat(data.data)
+ that.focuss()
+ },
+ },
+ });
+ } else if (res.code == 403) {
+ uni.showToast({
+ title: res.msg,
+ icon: "none",
+ position: 'top'
+ })
+ setTimeout(() => {
+ uni.reLaunch({
+ url: '../login/login'
+ });
+ }, 1000);
+ } else {
+ uni.showToast({
+ title: res.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) {
+ this.dataList.unshift(mat)
+ }
+ },
+ // 淇敼鎵瑰彿
+ 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,kind) {
+ if (kind == 'pakin') {
+ this.content = '鏄惁鐜板湪鍏ュ簱!'
+ this.kind = 'pakin'
+ } else {
+ this.content = '鏄惁鐜板湪鍑哄簱!'
+ this.kind = 'pakout'
+ }
+ this.msgType = type
+ this.title = '璀﹀憡'
+ this.$refs.combConfirm.open()
+ },
+ combClose() {
+ this.$refs.combConfirm.close()
+ },
+ comb() {
+ let that = this;
+ let params = []
+ if (this.kind == 'pakin') {
+ let param = {
+ devNo: this.dataList[0].devNo,
+ containerCode: this.barcode,
+ containerType: this.containerType,
+ }
+ params.push(param)
+ } else {
+ let param = {
+ devNo: this.dataList[0].devNo,
+ containerType: this.containerType,
+ }
+ params.push(param)
+ }
+
+ uni.request({
+ url: `${that.baseUrl}/agvMobile/${that.kind}/empty/auth`,
+ data: {
+ pad: params
+ },
+ method: 'POST',
+ header: {
+ 'token': uni.getStorageSync('token')
+ },
+ success(result) {
+ var res = result.data
+ if (res.code === 200) {
+ that.resst();
+ that.messageText = "鍚姩鎴愬姛"
+ that.messageToggle('success')
+ } 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.stationCode = ''
+ this.messageText = "閲嶇疆瀹屾垚"
+ this.messageToggle('success')
+ },
+ // 鍙栨秷閲嶇疆
+ resetClose() {
+
+ },
+ // 娓呯┖
+ resst() {
+ this.dataList = []
+ this.barcode = ''
+ this.stationCode = ''
+ this.barcodeFocuss()
+ },
+ }
+ }
+</script>
+
+<style>
+ @import url('../../../static/css/wms.css/wms.css');
+
+ .list:first-child {
+ margin-top: 280rpx;
+ }
+ .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: 140rpx;
+ z-index: 9;
+ /* border-top: 1px solid #DCDFE6; */
+ text-align: center;
+ box-shadow: 0px 0px 30px 0px rgba(0, 0, 0, 0.5);
+ }
+ .dropdown {
+ position: relative;
+ display: flex;
+ align-items: center;
+ padding: 0rpx 20rpx;
+ }
+ .dropdown-content {
+ position: absolute;
+ top: calc(100% + 15rpx);
+ left: 0;
+ width: calc(100% - 20rpx);
+ max-height: 300rpx;
+ background-color: #fff;
+ box-shadow: 0 0px 6px rgba(0, 0, 0, 0.3);
+ border-radius: 8rpx;
+ z-index: 10;
+ }
+ .dropdown-item {
+ padding: 12rpx;
+ line-height: 1.2;
+ font-size: 22px;
+ color: #3a3a3a;
+ }
+</style>
+
diff --git a/pages/phyz/AGV/emptyPakin.vue b/pages/phyz/AGV/emptyPakin.vue
index a4ec135..7b6d6b6 100644
--- a/pages/phyz/AGV/emptyPakin.vue
+++ b/pages/phyz/AGV/emptyPakin.vue
@@ -2,13 +2,11 @@
<view>
<view class="code">
<view class="item">
- <view class="code-decs">鏂欑鐮�:</view>
- <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus"
+ <input type="text" placeholder=" 鎵爜 / 杈撳叆 璐ф灦鐮�" v-model="barcode" :focus="barcodeFocus"
@input="barcodeInput()" readonly>
</view>
<view class="item">
- <view class="code-decs">鏆傚瓨浣�:</view>
- <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="stationCode" :focus="stationCodeFocus"
+ <input type="text" placeholder=" 鎵爜 / 杈撳叆 鏆傚瓨浣�" v-model="stationCode" :focus="stationCodeFocus"
@input="stationCodeInput()" readonly>
<view class="item-right">
<button></button>
@@ -152,7 +150,8 @@
removeNum: 0,
hide: true,
hidebg: 'kb-bgtr',
- kind: ''
+ kind: '',
+ containerType: 0
}
},
onLoad() {
@@ -189,7 +188,7 @@
stationCodeInput() {
setTimeout(() => {
var len = this.stationCode.length
- if (len != 15) {
+ if (len != 7) {
this.stationCode = ''
this.stationCodeFocus = true
uni.showToast({
@@ -224,13 +223,19 @@
},
// barcode input 浜嬩欢
barcodeInput() {
- // 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
- if (this.barcode.split('_')[1]) {
- this.barcode = this.barcode.split('_')[1]
- }
+ let val = this.barcode.substring(0,2)
+ if (val == '10') {
+ this.containerType = 1
+ } else if(val == '20') {
+ this.containerType = 2
+ } else if (val == '21') {
+ this.containerType = 3
+ } else if (val == '30') {
+ this.containerType = 4
+ }
setTimeout(() => {
var len = this.barcode.length
- if (len != 10) {
+ if (len != 6) {
uni.showToast({
title: '鏂欑鐮佹湁璇閲嶈瘯',
icon: "none",
@@ -444,13 +449,13 @@
let param = {
devNo: this.dataList[0].devNo,
containerCode: this.barcode,
- containerType: this.dataList[0].locType1,
+ containerType: this.containerType,
}
params.push(param)
} else {
let param = {
devNo: this.dataList[0].devNo,
- containerType: this.dataList[0].locType1,
+ containerType: this.containerType,
}
params.push(param)
}
diff --git a/pages/tzsk/AGV/AGVStart.vue b/pages/tzsk/AGV/AGVStart.vue
index 0a3b20e..d94c8c1 100644
--- a/pages/tzsk/AGV/AGVStart.vue
+++ b/pages/tzsk/AGV/AGVStart.vue
@@ -132,7 +132,7 @@
matFocus: false,
matData: '',
removeNum: 0,
- floorList: [1,3],
+ floorList: [1,2,3],
floor: "",
devNo: [],
btnText: '鍏ㄩ��',
--
Gitblit v1.9.1