From 1e40a94e41a811a30b49150b5feabe9b7797948a Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 14 五月 2024 08:23:06 +0800
Subject: [PATCH] #
---
pages/tzsk/AGV/AGVPakin.vue | 145 +++++++++++++++++++++---------------------------
1 files changed, 64 insertions(+), 81 deletions(-)
diff --git a/pages/tzsk/AGV/AGVPakin.vue b/pages/tzsk/AGV/AGVPakin.vue
index 4fd6b47..b6b4789 100644
--- a/pages/tzsk/AGV/AGVPakin.vue
+++ b/pages/tzsk/AGV/AGVPakin.vue
@@ -2,65 +2,22 @@
<view>
<view class="code">
<view class="item">
- <view class="code-decs">璁㈠崟鍙�:</view>
- <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="orderNo" :focus="orderNoFocus"
+ <input type="text" placeholder=" 鎵爜 / 杈撳叆 绔欑偣鐮�" v-model="orderNo" :focus="orderNoFocus"
@input="findOrder()">
</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="findMat()">
- <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="desc">绔欑偣鍙凤細</view>
<view class="left-item">
- <input type="text" v-model="item.containerCode">
- <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> -->
+ <uni-tag :text="item.barcode" 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 class="desc">绔欑偣鐘舵�侊細</view>
+ <view class="left-item">{{item.sts}}</view>
</view>
<view class="list-left-item">
<view class="desc">瑙勬牸锛�</view>
@@ -83,16 +40,13 @@
<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">
+ <view class="buttom-k">
+ <button size="mini" type="primary" @click="combConfirm('warn')">绌烘澘鍑哄簱</button>
+ <button size="mini" type="primary" @click="combConfirm('warn')">绌烘澘鍏ュ簱</button>
<button size="mini" @click="reset('warn')">閲嶇疆</button>
- <button size="mini" type="primary" @click="combConfirm('warn')">缁勬墭</button>
</view>
<!-- 寮圭獥 -->
<!-- 淇敼鏁伴噺 -->
@@ -143,7 +97,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"
@@ -172,7 +126,12 @@
token: '',
barcode: '',
orderNo: '',
- dataList: [],
+ dataList: [
+ {
+ barcode: 'CS-101-001-01@1',
+ sts: 'F.鍦ㄥ簱'
+ }
+ ],
count: 0,
rowNum: '',
matnr: '',
@@ -233,6 +192,7 @@
},
success(res) {
res = res.data
+ console.log(res);
if (res.code === 200) {
if(res.data && res.data[0].combMats) {
for (let i = 0; i < res.data[0].combMats.length; i++) {
@@ -243,11 +203,11 @@
that.barcodeFocus = true
}, 10);
} else {
- uni.showToast({
- title: that.orderNo + '璇锋鏌ヨ鍗曞彿鏄惁姝ｇ‘',
- icon: "none",
- position: 'top'
- })
+ // uni.showToast({
+ // title: that.orderNo + '璇锋鏌ヨ鍗曞彿鏄惁姝ｇ‘',
+ // icon: "none",
+ // position: 'top'
+ // })
}
} else if (res.code == 403) {
uni.showToast({
@@ -284,7 +244,10 @@
},
barcodeInput() {
// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
- this.barcode = this.barcode.split('_')[1]
+ if (this.barcode.split('_')[1]) {
+ this.barcode = this.barcode.split('_')[1]
+ }
+ // this.barcode = this.barcode.split('_')[1]
setTimeout(() => {
let len = this.barcode.length
if (len != 10) {
@@ -320,12 +283,12 @@
findMat() {
let that = this
// 鍒ゆ柇鐗╂枡闀垮害鏄惁涓�1
- if (that.dataList.length >= 1) {
- this.messageText = "鍙兘娣诲姞涓�绉嶇墿鏂�"
- this.messageToggle('warn')
- that.matnr = ''
- return
- }
+ // if (that.dataList.length >= 1) {
+ // this.messageText = "鍙兘娣诲姞涓�绉嶇墿鏂�"
+ // this.messageToggle('warn')
+ // that.matnr = ''
+ // return
+ // }
uni.request({
url: that.baseUrl + '/mat/auth',
data: { matnr: that.matnr },
@@ -342,12 +305,14 @@
success: function(res) {
res.eventChannel.emit('mat', {
data: result.data,
- tempOrderInfo: that.tempOrderInfo
+ // tempOrderInfo: that.tempOrderInfo
})
},
// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
events: {
matList: function(data) {
+ data.data['csocode'] = ''
+ data.data['isoseq'] = ''
that.checkMat(data.data)
that.focuss()
},
@@ -478,7 +443,7 @@
combConfirm(type) {
this.msgType = type
this.title = '璀﹀憡'
- this.content = '鏄惁鐜板湪缁勬墭!'
+ this.content = '鏄惁鐜板湪绌烘澘鍏ュ簱!'
this.$refs.combConfirm.open()
},
combClose() {
@@ -497,19 +462,21 @@
this.messageToggle('error')
return;
}
- if (that.dataList.length > 1) {
- this.messageText = "鍙兘娣诲姞涓�绉嶇墿鏂�"
- this.messageToggle('error')
- return;
- }
+ // if (that.dataList.length > 1) {
+ // 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.messageText = that.dataList[i].matnr + '绌烘澘鍏ュ簱鏁伴噺涓嶈兘涓�0'
this.messageToggle('error')
return;
}
}
- // console.log(that.dataList);
+ console.log(that.dataList);
+ console.log(that.barcode);
+ console.log(that.orderNo);
// return
uni.request({
url: that.baseUrl + '/agvMobile/comb/auth',
@@ -525,8 +492,11 @@
success(result) {
var res = result.data
if (res.code === 200) {
- that.resst();
- that.messageText = "缁勬墭鎴愬姛"
+ that.dataList = []
+ that.findOrder()
+ // that.resst();
+ that.barcode = ''
+ that.messageText = "绌烘澘鍏ュ簱鎴愬姛"
that.messageToggle('success')
const innerAudioContext = uni.createInnerAudioContext();
innerAudioContext.src = '/static/music/pakinOk.mp3';
@@ -591,12 +561,12 @@
}
.list:first-child {
- margin-top: 340rpx;
+ margin-top: 120rpx;
}
.code {
width: 100%;
position: fixed;
- min-height: 200rpx;
+ min-height: 70rpx;
background-color: #FFF;
z-index: 10;
}
@@ -642,4 +612,17 @@
text-align: center;
box-shadow: 0px 0px 30px 0px rgba(0, 0, 0, 0.5);
}
+ .buttom-k {
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ width: 100%;
+ display: flex;
+ flex-direction: column;
+ background-color: #FFF;
+ box-shadow: 0px 0px 10px 0px rgba(0,0,0,0.2) ;
+ }
+ .buttom-k button {
+ margin: 20rpx 50rpx;
+ }
</style>
--
Gitblit v1.9.1