From 5f7195dd2540f20f3acec968ffb85e39f625db3c Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 28 四月 2023 08:50:53 +0800
Subject: [PATCH] #
---
pages/mat/matSelected.vue | 1
pages/order/orderPakin.vue | 97 ++++++++++++++++++++++++++++--------------------
static/css/wms.css/wms.css | 2
3 files changed, 57 insertions(+), 43 deletions(-)
diff --git a/pages/mat/matSelected.vue b/pages/mat/matSelected.vue
index 8f6d132..a0d2b69 100644
--- a/pages/mat/matSelected.vue
+++ b/pages/mat/matSelected.vue
@@ -78,7 +78,6 @@
this.mat.anfme = value
},
back() {
- console.log(this.mat);
if (this.mat.anfme === 0) {
uni.showToast({title: '璇疯緭鍏ユ暟閲�', icon: "none", position: 'top'});
return;
diff --git a/pages/order/orderPakin.vue b/pages/order/orderPakin.vue
index fa7b6fa..249cbb5 100644
--- a/pages/order/orderPakin.vue
+++ b/pages/order/orderPakin.vue
@@ -32,13 +32,19 @@
<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">
+ <uni-tag :text="item.orderNo" 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="desc">鍚嶇О锛�</view>
<view class="left-item">{{item.maktx}}</view>
</view>
<view class="list-left-item">
@@ -75,14 +81,14 @@
<!-- 鏍囬 -->
<view class="title">淇敼</view>
<view class="popup-item">
- <view class="popup-item-left">缂栫爜:</view>
+ <view class="popup-item-left">鏂欏彿:</view>
<view class="popup-item-right">
- <input type="text" v-model="matnr" disabled="true"
+ <input type="text" v-model="matnr1" 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-left">鎵瑰彿:</view>
<view class="popup-item-right"><input type="text" v-model="batch"></view>
</view>
<view class="popup-item">
@@ -149,6 +155,7 @@
count: 0,
rowNum: '',
matnr: '',
+ matnr1: '',
batch: '',
msgType1: 'success',
msgType: 'success',
@@ -169,42 +176,10 @@
this.msgType1 = type
this.$refs.message.open()
},
- orderInput() {
- let that = this
- var order = that.order.split(";")
- that.order = order[0]
- that.matnr = order[1]
- setTimeout(() => {
- that.orderFocus = true
- }, 200)
- uni.request({
- url: that.baseUrl + '/ManPakOut/list/auth',
- data: {
- matnr: that.matnr
- },
- header: {
- 'token': uni.getStorageSync('token')
- },
- success(res) {
- console.log(res);
- }
- })
- },
// 鎼滅储鐗╂枡
findMat() {
let that = this
var matnr = that.matnr.split(";")
- if (that.order != '') {
- if (that.order != matnr[0]) {
- this.messageText = "褰撳墠鐗╂枡涓嶅湪璁㈠崟鍐咃紝璇烽噸鏂伴�夋嫨锛侊紒"
- this.messageToggle('error')
- setTimeout(()=> {
- that.matnr = ''
- that.matFocus = true
- },1000)
- return
- }
- }
that.order = matnr[0]
that.matnr = matnr[1]
uni.request({
@@ -237,9 +212,9 @@
},
},
});
- } else if (res.code == 403) {
+ } else if (result.code == 403) {
uni.showToast({
- title: res.msg,
+ title: result.msg,
icon: "none",
position: 'top'
})
@@ -250,7 +225,7 @@
}, 1000);
} else {
uni.showToast({
- title: res.msg,
+ title: result.msg,
icon: "none",
position: 'top'
})
@@ -261,6 +236,7 @@
},
checkMat(mat) {
+ mat['orderNo'] = this.order
var len = this.dataList.length
var add = true ,sameItem = false
for (var i = 0; i < len; i++) {
@@ -291,7 +267,7 @@
this.dataList.unshift(mat)
}
},
- combConfirm() {
+ combConfirm(type) {
this.msgType = type
this.title = '璀﹀憡'
this.content = '鏄惁鐜板湪缁勬墭!'
@@ -366,6 +342,45 @@
resetClose() {
},
+ // 淇敼鎵瑰彿
+ revise(item, i) {
+ this.matnr1 = this.dataList[i].matnr
+ this.count = this.dataList[i].anfme
+ this.batch = this.dataList[i].batch
+ this.rowNum = i
+ this.eject()
+ },
+ eject(type) {
+ this.type = type
+ this.$refs.revise.open(type)
+ },
+ // 鍒楄〃绉婚櫎鎸夐挳
+ remove(item, i, type) {
+ this.msgType = type
+ this.title = '璀﹀憡'
+ this.content = '鏄惁绉婚櫎褰撳墠鍟嗗搧!'
+ this.$refs.alertDialog.open(i)
+ },
+ // 纭绉婚櫎
+ removeConfirm(i) {
+ this.messageText = "绉婚櫎鎴愬姛"
+ this.messageToggle('success')
+ this.dataList.splice(i, 1)
+ },
+ reviseConfirm() {
+ this.dataList[this.rowNum].anfme = this.count
+ this.dataList[this.rowNum].batch = this.batch
+ this.messageText = "淇敼鎴愬姛"
+ this.messageToggle('success')
+ this.$refs.revise.close()
+ this.$forceUpdate() // 寮哄埗鍒锋柊
+ },
+ reviseClose() {
+ this.$refs.revise.close()
+ },
+ changeValue(value) {
+ this.count = value
+ },
}
}
</script>
diff --git a/static/css/wms.css/wms.css b/static/css/wms.css/wms.css
index a4ce720..a62857c 100644
--- a/static/css/wms.css/wms.css
+++ b/static/css/wms.css/wms.css
@@ -27,7 +27,7 @@
min-height: 40rpx;
display: flex;
align-items: center;
- width: 20%;
+ width: 25%;
}
.left-item {
display: flex;
--
Gitblit v1.9.1