From 9f8c2ee719613a600ddf76f4958c5c860cbe2ac6 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 26 三月 2024 13:08:40 +0800
Subject: [PATCH] #
---
pages/phyz/AGV/AGVPakin.vue | 2
pages.json | 8 ++++
pages/phyz/wrkMast/wrkMast.vue | 50 ++++++++++++++++++------
pages/tzsk/AGV/AGVStart.vue | 15 +++++--
pages/phyz/wrkMast/wrkDetl.vue | 22 +++++++++++
5 files changed, 79 insertions(+), 18 deletions(-)
diff --git a/pages.json b/pages.json
index 7681b95..f48a8f7 100644
--- a/pages.json
+++ b/pages.json
@@ -474,6 +474,14 @@
"navigationBarTitleText" : "鍏ュ簱閫氱煡妗�",
"enablePullDownRefresh" : false
}
+ },
+ {
+ "path" : "pages/phyz/wrkMast/wrkDetl",
+ "style" :
+ {
+ "navigationBarTitleText" : "宸ヤ綔妗ｆ槑缁�",
+ "enablePullDownRefresh" : false
+ }
}
diff --git a/pages/phyz/AGV/AGVPakin.vue b/pages/phyz/AGV/AGVPakin.vue
index dd3627d..15ce7ba 100644
--- a/pages/phyz/AGV/AGVPakin.vue
+++ b/pages/phyz/AGV/AGVPakin.vue
@@ -3,7 +3,7 @@
<view class="code">
<view class="item">
<input type="text" placeholder=" 鎵爜 / 杈撳叆 璁㈠崟鍙�" v-model="orderNo" :focus="orderNoFocus"
- @input="findOrder()" disabled>
+ @input="findOrder()">
</view>
<view class="item">
<input type="text" placeholder=" 鎵爜 / 杈撳叆 璐ф灦鐮�" v-model="barcode" :focus="barcodeFocus"
diff --git a/pages/phyz/wrkMast/wrkDetl.vue b/pages/phyz/wrkMast/wrkDetl.vue
new file mode 100644
index 0000000..8183fd0
--- /dev/null
+++ b/pages/phyz/wrkMast/wrkDetl.vue
@@ -0,0 +1,22 @@
+<template>
+ <view>
+
+ </view>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+
+ }
+ },
+ methods: {
+
+ }
+ }
+</script>
+
+<style>
+
+</style>
diff --git a/pages/phyz/wrkMast/wrkMast.vue b/pages/phyz/wrkMast/wrkMast.vue
index a18a608..74f96c1 100644
--- a/pages/phyz/wrkMast/wrkMast.vue
+++ b/pages/phyz/wrkMast/wrkMast.vue
@@ -10,30 +10,30 @@
<view class="list-left">
<!-- 宸︿笂 -->
<view class="list-left-top">
- <view style="font-weight: bold;">宸ヤ綔鍙�4099</view>
+ <view style="font-weight: bold;">宸ヤ綔鍙穥{item.wrkNo}}</view>
<view style="display: flex;border-bottom: 1px solid #FFF;margin: 10rpx;">
<text style="flex: 1;">宸ヤ綔鐘舵��</text>
- <text>201.鐢熸垚鍏ュ簱浠诲姟ID</text>
+ <text>{{item.wrkSts$}}</text>
</view>
<view style="display: flex;border-bottom: 1px solid #FFF;margin: 10rpx;">
<text style="flex: 1;">鍏ュ嚭搴撶被鍨�</text>
- <text>1.鍏ュ簱</text>
+ <text>{{item.ioType$}}</text>
</view>
<view style="display: flex;border-bottom: 1px solid #FFF;margin: 10rpx;">
<text style="flex: 1;">浼樺厛绾�</text>
- <text>300</text>
+ <text>{{item.ioPri}}</text>
</view>
<view style="display: flex;border-bottom: 1px solid #FFF;margin: 10rpx;">
<text style="flex: 1;">婧愬簱浣�</text>
- <text>CS-101-001-01@1</text>
+ <text>{{item.sourceLocNo}}</text>
</view>
<view style="display: flex;border-bottom: 1px solid #FFF;margin: 10rpx;">
<text style="flex: 1;">鐩爣搴撲綅</text>
- <text>YZ-015-001-01@1</text>
+ <text>{{item.locNo}}</text>
</view>
<view style="display: flex;border-bottom: 1px solid #FFF;margin: 10rpx;">
<text style="flex: 1;">鏂欑鐮�</text>
- <text>1112223335</text>
+ <text>{{item.barcode}}</text>
</view>
</view>
<!-- 宸︿笅 -->
@@ -54,14 +54,18 @@
export default {
data() {
return {
+ baseUrl: '',
+ token: '',
searchValue: '',
searchFocus: true,
- dataList: [
- {},
- {},
- {}
- ]
+ dataList: []
}
+ },
+ onShow() {
+ this.baseUrl = uni.getStorageSync('baseUrl');
+ this.token = uni.getStorageSync('token');
+ this.oldDataList = [...this.dataList]
+ this.getWaitPakinList()
},
methods: {
// 鎼滅储妗嗚緭鍏�
@@ -71,7 +75,27 @@
// 閲嶇疆鎼滅储妗�
clear() {
- }
+ },
+ // 鑾峰彇宸ヤ綔鍒楄〃
+ getWaitPakinList() {
+ let _this = this
+ _this.dataList = []
+ uni.request({
+ url: `${_this.baseUrl}/agv/wrkMast/list/auth`,
+ header: {'token': uni.getStorageSync('token')},
+ data: {
+ curr: 1,
+ limit: 1000,
+ },
+ method: 'GET',
+ success(res) {
+ res = res.data
+ if (res.code === 200) {
+ _this.dataList = res.data.records
+ }
+ }
+ })
+ },
}
}
</script>
diff --git a/pages/tzsk/AGV/AGVStart.vue b/pages/tzsk/AGV/AGVStart.vue
index 4264c20..0a3b20e 100644
--- a/pages/tzsk/AGV/AGVStart.vue
+++ b/pages/tzsk/AGV/AGVStart.vue
@@ -473,16 +473,23 @@
this.devNo = []
uni.vibrateShort();
let that = this;
+ let params = []
for (var i = 0; i < this.dataList.length; i++) {
if (this.dataList[i].checked) {
this.devNo.push(this.dataList[i].devNo)
+ let param = {
+ devNo: this.dataList[i].devNo,
+ containerCode: this.dataList[i].barcode,
+ containerType: this.dataList[i].locType1,
+ }
+ params.push(param)
}
}
uni.request({
- url: that.baseUrl + '/agvMobile/pakin/auth',
- data: JSON.stringify({
- devNo: that.devNo
- }),
+ url: that.baseUrl + '/agvMobile/pakin/empty/auth',
+ data: {
+ pad: params
+ },
method: 'POST',
header: {
'token': uni.getStorageSync('token')
--
Gitblit v1.9.1