From 550de61d9a9f2c1701858277bcf132b8ae895f65 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 10 十月 2023 16:02:49 +0800
Subject: [PATCH] #
---
pages/home/home.vue | 2
pages/login/login.vue | 3
pages/tzsk/AGV/AGVPick.vue | 591 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
pages/tzsk/AGV/AGVPick - 副本.vue | 0
pages/tzsk/AGV/AGVStart.vue | 4
5 files changed, 598 insertions(+), 2 deletions(-)
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 7105ee9..10dac12 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -54,7 +54,7 @@
},
{
title: 'AGV鐩樼偣/鎷ｆ枡',
- name: 'pakin',
+ name: 'AGVPick',
color: 'cyan',
cuIcon: 'pullup',
url: '/tzsk/AGV/AGVPick'
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 78e9ddc..d27e301 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -188,6 +188,9 @@
"content-type": "application/json"
},
success(result) {
+ uni.reLaunch({
+ url: '../home/home'
+ });
if (result.statusCode === 404) {
uni.showToast({
title: '鐧诲綍澶辫触',
diff --git a/pages/tzsk/AGV/AGVPick.vue.vue "b/pages/tzsk/AGV/AGVPick - \345\211\257\346\234\254.vue"
similarity index 100%
rename from pages/tzsk/AGV/AGVPick.vue.vue
rename to "pages/tzsk/AGV/AGVPick - \345\211\257\346\234\254.vue"
diff --git a/pages/tzsk/AGV/AGVPick.vue b/pages/tzsk/AGV/AGVPick.vue
new file mode 100644
index 0000000..941f15d
--- /dev/null
+++ b/pages/tzsk/AGV/AGVPick.vue
@@ -0,0 +1,591 @@
+<template>
+ <view>
+ <view class="code">
+ <view class="item">
+ <view class="code-decs">妤煎彿:</view>
+ <uni-combox :candidates="floorList" placeholder="璇烽�夋嫨妤煎彿" v-model="floor" @input="getFloor"></uni-combox>
+ </view>
+ <view class="item">
+ <view class="code-decs">鏆傚瓨浣�:</view>
+ <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="stationCode" :focus="stationCodeFocus"
+ @input="stationCodeInput()">
+ </view>
+ </view>
+
+ <view class="mat-list-title">
+ <view style="-webkit-flex: 1;flex: 1;"></view>
+ <view style="-webkit-flex: 1;flex: 1;">绔欑偣鍒楄〃</view>
+ <view style="-webkit-flex: 1;flex: 1;"><button size="mini" @click="selectAll()">{{btnText}}</button></view>
+ </view>
+ <scroll-view>
+ <view class="list" v-for="(item,i) in dataList" :key="i" :class="'bg-'+item.color">
+ <view class="aside">
+ <checkbox :value="item.matnr" :checked="item.checked" @click="set(i)"/>
+ </view>
+ <view class="list-left" style="display: flex;justify-content: center;">
+ {{item.devNo}}
+ </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="containerMove()">瀹瑰櫒绂诲満</button>
+ <button size="mini" type="primary" @click="containerPick()">鐩樼偣 / 鎷ｈ揣</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>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+ baseUrl: '',
+ token: '',
+ barcode: '',
+ stationCode: '',
+ stationCodeFocus: true,
+ dataList: [
+ {devNo:'12321321'},
+ {devNo:'12321321'},
+ {devNo:'12321321'},
+ ],
+ count: 0,
+ rowNum: '',
+ matnr: '',
+ batch: '',
+ weight: '',
+ msgType1: 'success',
+ msgType: 'success',
+ messageText: '',
+ title: '',
+ content: '',
+ barcodeFocus: true,
+ matFocus: false,
+ matData: '',
+ removeNum: 0,
+ floorList: [1,3],
+ floor: "",
+ devNo: [],
+ btnText: '鍏ㄩ��',
+
+ }
+ },
+ onLoad() {
+ },
+ onShow() {
+ this.baseUrl = uni.getStorageSync('baseUrl');
+ this.token = uni.getStorageSync('token');
+ },
+ methods: {
+ stationCodeInput() {
+ setTimeout(() => {
+ var len = this.stationCode.length
+ if (len != 15) {
+ this.stationCode = ''
+ this.stationCodeFocus = true
+ uni.showToast({
+ title: '鏆傚瓨鐮佹湁璇閲嶈瘯',
+ icon: "none",
+ position: 'top'
+ });
+ return;
+ }
+ this.pushDevNo()
+ this.stationCodeFocuss()
+ }, 200)
+ },
+ pushDevNo() {
+ var devNo = {"devNo":this.stationCode}
+ if (this.dataList.length == 0) {
+ this.dataList.push(devNo)
+ return
+ }
+ var flag = false
+ for(var i = 0; i < this.dataList.length; i++ ) {
+ if (this.dataList[i].devNo == devNo.devNo) {
+ this.messageText = "绔欑偣閲嶅"
+ this.messageToggle('warn')
+ return
+ } else {
+ flag = true
+ }
+ }
+ if(flag) {
+ this.dataList.push(devNo)
+ }
+
+ },
+ stationCodeFocuss() {
+ let that = this;
+ this.stationCode = ''
+ that.stationCodeFocus = false;
+ setTimeout(() => {
+ that.stationCodeFocus = true;
+ }, 100);
+ },
+ getChecked() {
+ var checkedList = []
+ for(var i = 0; i < this.dataList.length; i++) {
+ var t = !this.dataList[i].checked
+ if (this.dataList[i].checked) {
+ checkedList.push(this.dataList[i])
+ }
+ }
+ this.dataList = checkedList
+ },
+ set(i) {
+ var ck = this.dataList[i].checked
+ this.dataList[i].checked = ck ? false:true
+
+ },
+ selectAll() {
+ if (this.btnText == '鍏ㄩ��') {
+ for (let i in this.dataList) {
+ this.$set(this.dataList[i],'checked',true)
+ this.btnText = '鍙栨秷'
+ }
+ } else {
+ for (let i in this.dataList) {
+ var ck = this.dataList[i].checked
+ this.dataList[i].checked = ck ? false:true
+ this.btnText = '鍏ㄩ��'
+ }
+ }
+
+ },
+ getFloor() {
+ let that = this
+ if (this.floor == '') {
+ return
+ }
+ uni.request({
+ url: that.baseUrl + '/agvMobile/getBasDevp/auth',
+ data: {
+ floor: that.floor
+ },
+ header: {
+ 'token': uni.getStorageSync('token')
+ },
+ method: 'POST',
+ success(res) {
+ res = res.data
+ for(var i = 0; i < res.data.length; i++) {
+ if (res.data[i].locSts === 'F') {
+ // res.data[i]["color"] = "red"
+ that.dataList.push(res.data[i])
+ }
+ }
+ }
+ });
+ },
+ messageToggle(type) {
+ this.msgType1 = type
+ this.$refs.message.open()
+ },
+ // barcode input 浜嬩欢
+ barcodeInput() {
+ // 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
+ setTimeout(() => {
+ var len = this.barcode.length
+ if (len != 8) {
+ uni.showToast({
+ title: '鎵樼洏鐮佹湁璇閲嶈瘯',
+ icon: "none",
+ position: 'top'
+ });
+ this.barcodeFocuss()
+ return;
+ }
+ this.focuss()
+ }, 200)
+ },
+ // 鎵樼洏鐮佹湁璇噸缃�
+ 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) {
+ this.msgType = type
+ this.title = '璀﹀憡'
+ this.content = '鏄惁鐜板湪鍚姩!'
+ this.$refs.combConfirm.open()
+ },
+ combClose() {
+ this.$refs.combConfirm.close()
+ },
+ comb() {
+ this.devNo = []
+ uni.vibrateShort();
+ let that = this;
+ for (var i = 0; i < this.dataList.length; i++) {
+ if (this.dataList[i].checked) {
+ this.devNo.push(this.dataList[i].devNo)
+ }
+ }
+ uni.request({
+ url: that.baseUrl + '/agvMobile/pakin/auth',
+ data: JSON.stringify({
+ devNo: that.devNo
+ }),
+ 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.stationCode = ''
+ this.floor = ''
+ this.messageText = "閲嶇疆瀹屾垚"
+ this.messageToggle('success')
+ },
+ // 鍙栨秷閲嶇疆
+ resetClose() {
+
+ },
+ // 娓呯┖
+ resst() {
+ this.dataList = []
+ this.barcode = ''
+ this.stationCode = ''
+ this.floor = ''
+ this.barcodeFocuss()
+ },
+ }
+ }
+</script>
+
+<style>
+ @import url('../../../static/css/wms.css/wms.css');
+
+ .bg-red {
+ background-color: #e54d42;
+ color: #ffffff;
+ }
+ .bg-white {
+ background-color: #ffffff;
+ color: #666666;
+ }
+ .list:first-child {
+ margin-top: 360rpx;
+ }
+ .aside {
+ width: 100rpx;
+ /* background-color: #303133; */
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+ .code {
+ width: 100%;
+ position: fixed;
+ min-height: 100rpx;
+ background-color: #FFF;
+ z-index: 10;
+ }
+
+ .item {
+ display: flex;
+ align-items: center;
+ height: 100rpx;
+ 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 {
+ display: flex;
+ align-items: center;
+ height: 80rpx;
+ width: 100%;
+ background-color: white;
+ position: fixed;
+ margin-top: 200rpx;
+ z-index: 9;
+ /* border-top: 1px solid #DCDFE6; */
+ text-align: center;
+ box-shadow: 0px 0px 30px 0px rgba(0, 0, 0, 0.5);
+ }
+</style>
diff --git a/pages/tzsk/AGV/AGVStart.vue b/pages/tzsk/AGV/AGVStart.vue
index 378b0c7..c06acf6 100644
--- a/pages/tzsk/AGV/AGVStart.vue
+++ b/pages/tzsk/AGV/AGVStart.vue
@@ -13,7 +13,9 @@
</view>
<view class="mat-list-title">
+ <view style="-webkit-flex: 1;flex: 1;"></view>
<view style="-webkit-flex: 1;flex: 1;">绔欑偣鍒楄〃</view>
+ <view style="-webkit-flex: 1;flex: 1;"><button size="mini">鍏ㄩ��</button></view>
</view>
<scroll-view>
<view class="list" v-for="(item,i) in dataList" :key="i" :class="'bg-'+item.color">
@@ -109,7 +111,7 @@
barcode: '',
stationCode: '',
stationCodeFocus: true,
- dataList: [],
+ dataList: [{}],
count: 0,
rowNum: '',
matnr: '',
--
Gitblit v1.9.1