From 56fd0b3433ea569ac75bce80145c34b2f638e142 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期六, 30 三月 2024 13:42:14 +0800
Subject: [PATCH] #
---
pages/phyz/order/orderList.vue | 2 ++
pages/phyz/AGV/emptyPakin.vue | 2 +-
pages/phyz/order/preview.vue | 24 ++++++++++++++++++++----
pages.json | 2 +-
static/css/common/order.css | 5 +++--
pages/home/inOutManage.vue | 2 +-
pages/phyz/AGV/AGVPakin3.vue | 19 +++++++++++++------
7 files changed, 41 insertions(+), 15 deletions(-)
diff --git a/pages.json b/pages.json
index 4dc6d73..d98101b 100644
--- a/pages.json
+++ b/pages.json
@@ -487,7 +487,7 @@
"path" : "pages/phyz/AGV/emptyPakin",
"style" :
{
- "navigationBarTitleText" : "绌烘澘鍏ュ嚭搴�",
+ "navigationBarTitleText" : "绌烘澘鍏ュ簱",
"enablePullDownRefresh" : false
}
},
diff --git a/pages/home/inOutManage.vue b/pages/home/inOutManage.vue
index 90b3bed..cba0e9e 100644
--- a/pages/home/inOutManage.vue
+++ b/pages/home/inOutManage.vue
@@ -26,7 +26,7 @@
project: 'tzsk',
elements2: [
{
- title: '绌烘澘鍏ュ嚭搴�',
+ title: '绌烘澘鍏ュ簱',
name: 'emptyIn',
color: 'blue',
// cuIcon: 'pullup',
diff --git a/pages/phyz/AGV/AGVPakin3.vue b/pages/phyz/AGV/AGVPakin3.vue
index 402ff55..6269cb3 100644
--- a/pages/phyz/AGV/AGVPakin3.vue
+++ b/pages/phyz/AGV/AGVPakin3.vue
@@ -205,6 +205,9 @@
eventChannel.on('mats', function(data) {
console.log(data);
that.orderNo = data.mats[0].orderNo
+ for (let k of data.mats) {
+ k.anfme = k.enableQty
+ }
that.dataList = data.mats
})
},
@@ -574,9 +577,11 @@
that.resst();
that.messageText = "缁勬墭鎴愬姛"
that.messageToggle('success')
- uni.navigateBack({
- delta: 2
- });
+ setTimeout(()=> {
+ uni.navigateBack({
+ delta: 2
+ });
+ },700)
}
} else if (res.code == 403) {
that.messageText = res.msg
@@ -673,9 +678,11 @@
that.resst();
that.messageText = "鍚姩鎴愬姛"
that.messageToggle('success')
- uni.navigateBack({
- delta: 2
- });
+ setTimeout(()=>{
+ uni.navigateBack({
+ delta: 2
+ });
+ },700)
} else if (res.code == 403) {
that.messageText = res.msg
that.messageToggle('error')
diff --git a/pages/phyz/AGV/emptyPakin.vue b/pages/phyz/AGV/emptyPakin.vue
index 7b6d6b6..d4b4f7a 100644
--- a/pages/phyz/AGV/emptyPakin.vue
+++ b/pages/phyz/AGV/emptyPakin.vue
@@ -51,7 +51,7 @@
<!-- 搴曢儴鎿嶄綔鎸夐挳 -->
<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','pakout')">鍑哄簱</button> -->
<button size="mini" type="primary" @click="combConfirm('warn','pakin')">鍏ュ簱</button>
</view>
<!-- 寮圭獥 -->
diff --git a/pages/phyz/order/orderList.vue b/pages/phyz/order/orderList.vue
index 815d4a6..92db836 100644
--- a/pages/phyz/order/orderList.vue
+++ b/pages/phyz/order/orderList.vue
@@ -116,7 +116,9 @@
res = res.data
console.log(res);
if (res.code === 200) {
+ res.data.records
_this.dataList = res.data.records
+
_this.oldDataList = [..._this.dataList]
}
}
diff --git a/pages/phyz/order/preview.vue b/pages/phyz/order/preview.vue
index 6fbca48..8dd7c69 100644
--- a/pages/phyz/order/preview.vue
+++ b/pages/phyz/order/preview.vue
@@ -23,10 +23,10 @@
<view>璐т綅锛歿{item.locNo}}</view>
<view style="display: flex;">鍑哄簱绔欙細
<view class="dropdown" @click="toggleDropdown(item)">
- <input type="text" style="width: 270rpx;" v-model="item.agvStaNo">
+ <input type="text" style="width: 270rpx;" v-model="item.agvStaNo" placeholder="璇烽�夋嫨鍑哄簱绔�">
<uni-icons :type="item.isOpen ? 'top' : 'bottom'" color="#c1c1c1" style="margin-left: 10rpx;"></uni-icons>
<scroll-view scroll-y="ture" class="dropdown-content" v-if="item.isOpen">
- <view class="dropdown-item" v-for="option in selects" @click="selected(option,item)">{{option.value}}</view>
+ <view class="dropdown-item" v-for="option in item.agvStaNos" @click="selected(option,item)">{{option}}</view>
</scroll-view>
</view>
</view>
@@ -59,7 +59,7 @@
matFocus: true,
matnr: '',
checck: true,
- dataList: [{}],
+ dataList: [],
oldDataList: [],
newDataList: [],
allCheck: false,
@@ -103,7 +103,7 @@
item.isOpen = !item.isOpen;
},
selected(option,item) {
- item.agvStaNo = option.value
+ item.agvStaNo = option
},
// 璁㈠崟鏄庣粏
getPakoutList(ids) {
@@ -219,6 +219,14 @@
success(res) {
res = res.data
console.log(res);
+ if (res.code === 200) {
+ uni.showToast({ title: '鍑哄簱鎴愬姛', icon: "success", position: 'top'})
+ setTimeout(()=> {
+ uni.navigateBack({
+ delta: 2
+ });
+ },700)
+ }
}
})
},
@@ -244,6 +252,14 @@
},
});
},
+ // 绋嶅悗澶勭悊
+ reset() {
+ setTimeout(()=> {
+ uni.navigateBack({
+ delta: 2
+ });
+ },700)
+ }
}
}
</script>
diff --git a/static/css/common/order.css b/static/css/common/order.css
index a18b888..5351733 100644
--- a/static/css/common/order.css
+++ b/static/css/common/order.css
@@ -113,8 +113,9 @@
z-index: 10;
}
.dropdown-item {
+ margin: 12rpx;
padding: 12rpx;
- line-height: 1.2;
- font-size: 12rpx;
+ line-height: 1;
+ font-size: 32rpx;
color: #3a3a3a;
}
\ No newline at end of file
--
Gitblit v1.9.1