From 086363406e7abae8b6debfa2381a998ce604c2c8 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 04 十二月 2025 14:13:42 +0800
Subject: [PATCH] #
---
pages/mat/matSelected.vue | 50 ++++++---
pages/check/check.vue | 89 +++++++++++++++++
pages.json | 126 ++++++++++++++----------
pages/pakin/pakin.vue | 26 ++--
4 files changed, 203 insertions(+), 88 deletions(-)
diff --git a/pages.json b/pages.json
index 9d150ed..34d2ee0 100644
--- a/pages.json
+++ b/pages.json
@@ -37,6 +37,18 @@
}
},
{
+ "path": "pages/AGV/CollectionPakin",
+ "style": {
+ "navigationBarTitleText": "闆嗚揣鍖虹粍鎵�"
+ }
+ },
+ {
+ "path": "pages/AGV/CollectionInCall",
+ "style": {
+ "navigationBarTitleText": "闆嗚揣鍖哄叆搴�"
+ }
+ },
+ {
"path": "pages/AGV/CachePakin",
"style": {
"navigationBarTitleText": "缂撳瓨鍖虹粍鎵�"
@@ -58,6 +70,12 @@
"path": "pages/AGV/AGVStart",
"style": {
"navigationBarTitleText": "AGV鍚姩鍏ュ簱"
+ }
+ },
+ {
+ "path": "pages/AGV/CallEmptyCar",
+ "style": {
+ "navigationBarTitleText": "鍏ュ簱鍖哄懠鍙┖杞�"
}
},
{
@@ -216,14 +234,14 @@
"navigationBarTitleText": "鎹㈡澘缁戝畾"
}
},
-
+
{
"path": "pages/print/qr",
"style": {
"navigationBarTitleText": "浜岀淮鐮�"
}
},
-
+
{
"path": "pages/mat/matList",
"style": {
@@ -243,22 +261,19 @@
}
},
{
- "path" : "pages/order/orderPakin2",
- "style" :
- {
- "navigationBarTitleText" : "璁㈠崟缁勬墭",
- "enablePullDownRefresh" : false
+ "path": "pages/order/orderPakin2",
+ "style": {
+ "navigationBarTitleText": "璁㈠崟缁勬墭",
+ "enablePullDownRefresh": false
}
- }
- ,{
- "path" : "pages/order/orderList",
- "style" :
- {
- "navigationBarTitleText": "鍗曟嵁鍒楄〃",
- "enablePullDownRefresh": false
- }
-
- },
+ }, {
+ "path": "pages/order/orderList",
+ "style": {
+ "navigationBarTitleText": "鍗曟嵁鍒楄〃",
+ "enablePullDownRefresh": false
+ }
+
+ },
{
"path": "pages/order/orderDetlList",
"style": {
@@ -266,51 +281,54 @@
}
},
{
- "path" : "pages/AGV/AGVSiteList",
- "style" :
- {
- "navigationBarTitleText": "浜х嚎鍙枡",
- "enablePullDownRefresh": false
- }
-
+ "path": "pages/AGV/AGVSiteList",
+ "style": {
+ "navigationBarTitleText": "浜х嚎鍙枡",
+ "enablePullDownRefresh": false
+ }
+
},
{
- "path" : "pages/AGV/AGVLineCall",
- "style" :
- {
- "navigationBarTitleText": "浜х嚎鍙枡",
- "enablePullDownRefresh": false
- }
-
+ "path": "pages/AGV/AGVLineCall",
+ "style": {
+ "navigationBarTitleText": "浜х嚎鍙枡",
+ "enablePullDownRefresh": false
+ }
+
},
{
- "path" : "pages/AGV/AGVFinishedCall",
- "style" :
- {
- "navigationBarTitleText": "鎴愬搧鍛煎彨",
- "enablePullDownRefresh": false
- }
-
+ "path": "pages/AGV/AGVFinishedCall",
+ "style": {
+ "navigationBarTitleText": "鎴愬搧鍛煎彨",
+ "enablePullDownRefresh": false
+ }
+
},
{
- "path" : "pages/AGV/AGVStaBind",
- "style" :
- {
- "navigationBarTitleText": "AGV绔欑粦瀹�",
- "enablePullDownRefresh": false
- }
-
+ "path": "pages/AGV/AGVStaBind",
+ "style": {
+ "navigationBarTitleText": "AGV绔欑粦瀹�",
+ "enablePullDownRefresh": false
+ }
+
},
{
- "path" : "pages/check/check",
- "style" :
- {
- "navigationBarTitleText": "鐩樼偣",
- "enablePullDownRefresh": false
- }
-
+ "path": "pages/check/check",
+ "style": {
+ "navigationBarTitleText": "鐩樼偣",
+ "enablePullDownRefresh": false
+ }
+
+ },
+ {
+ "path": "pages/check/checkMatSelected",
+ "style": {
+ "navigationBarTitleText": "娣诲姞鍟嗗搧",
+ "enablePullDownRefresh": false
+ }
+
}
- ],
+ ],
"globalStyle": {
"navigationBarTextStyle": "black",
"navigationBarTitleText": "uni-app",
@@ -318,4 +336,4 @@
"backgroundColor": "#F8F8F8"
},
"uniIdRouter": {}
-}
+}
\ No newline at end of file
diff --git a/pages/check/check.vue b/pages/check/check.vue
index 2cd67a2..4b4f95f 100644
--- a/pages/check/check.vue
+++ b/pages/check/check.vue
@@ -8,7 +8,9 @@
</view>
</view>
<view class="mat-list-title">
- 鍟嗗搧鍒楄〃
+ <view style="width: 200rpx;"></view>
+ <view style="-webkit-flex: 1;flex: 1;">鍟嗗搧鍒楄〃</view>
+ <view style="width: 200rpx; display: flex; justify-content: center; align-items: center;"><button size="mini" type="primary" @click="openAddDialog">娣诲姞</button></view>
</view>
<scroll-view>
<view class="list" v-for="(item,i) in dataList" :key="i">
@@ -31,8 +33,8 @@
</view>
<view class="list-left-item">
- <view class="desc">瑙勬牸锛�</view>
- <view class="left-item">{{item.specs}}</view>
+ <view class="desc">渚涘簲鍟嗭細</view>
+ <view class="left-item">{{item.suppCode}}</view>
</view>
<view class="list-left-item">
<view class="desc">鎵瑰彿锛�</view>
@@ -121,6 +123,24 @@
@confirm="resetConfirm" @close="resetClose"></uni-popup-dialog>
</uni-popup>
</view>
+ <!-- 娣诲姞鍟嗗搧寮圭獥 -->
+ <view>
+ <uni-popup ref="addDialog" 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="addMatnr" placeholder="璇疯緭鍏ョ紪鐮�">
+ </view>
+ </view>
+ <view class="btn">
+ <view class="btn-left" @click="addClose">鍙栨秷</view>
+ <view class="btn-right" @click="addConfirm">鎻愪氦</view>
+ </view>
+ </view>
+ </uni-popup>
+ </view>
</view>
</template>
@@ -144,7 +164,8 @@
barcodeFocus: true,
matFocus: false,
matData: '',
- pushDisabled:false
+ pushDisabled:false,
+ addMatnr: ''
}
},
@@ -326,6 +347,64 @@
})
},
+ // 鎵撳紑娣诲姞寮圭獥
+ openAddDialog() {
+ this.addMatnr = ''
+ this.$refs.addDialog.open()
+ },
+ // 鍙栨秷娣诲姞
+ addClose() {
+ this.$refs.addDialog.close()
+ },
+ // 纭娣诲姞
+ addConfirm() {
+ if (!this.addMatnr) {
+ this.messageText = "璇疯緭鍏ョ紪鐮�"
+ this.messageToggle('error')
+ return
+ }
+ let that = this
+ uni.request({
+ url: that.baseUrl + '/mat/auth?matnr=' + encodeURIComponent(that.addMatnr),
+ header: {
+ 'token': uni.getStorageSync('token')
+ },
+ method: 'GET',
+ success(res) {
+ res = res.data
+ if (res.code === 200) {
+ if (!res.data) {
+ that.messageText = "鏈壘鍒拌鍟嗗搧"
+ that.messageToggle('error')
+ return
+ }
+ that.$refs.addDialog.close()
+ uni.navigateTo({
+ url: './checkMatSelected',
+ success: function(result) {
+ result.eventChannel.emit('mat', {data: res.data})
+ },
+ events: {
+ checkMatList: function(data) {
+ that.dataList.push(data.data)
+ }
+ }
+ })
+ } 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')
+ }
+ }
+ })
+ }
}
}
</script>
@@ -374,6 +453,8 @@
}
.mat-list-title {
+ display: flex;
+ align-items: center;
height: 80rpx;
line-height: 80rpx;
width: 100%;
diff --git a/pages/mat/matSelected.vue b/pages/mat/matSelected.vue
index 55b5ff5..823e43d 100644
--- a/pages/mat/matSelected.vue
+++ b/pages/mat/matSelected.vue
@@ -1,27 +1,29 @@
<template>
<view>
<view class="form" v-for="mat in mats">
- <view class="form-item">
+ <!-- <view class="form-item">
<view class="form-item-desc"><text>璁㈠崟鍙�</text></view>
<view class="form-item-content"><text>{{mat.orderNo}}</text></view>
- </view>
+ </view> -->
<view class="form-item">
<view class="form-item-desc"><text>鍟嗗搧缂栫爜</text></view>
<view class="form-item-content"><text>{{mat.matnr}}</text></view>
</view>
<view class="form-item">
<view class="form-item-desc"><text>鍟嗗搧鍚嶇О</text></view>
- <view class="form-item-content" style="word-break: break-all;line-height: 1.5;"><text>{{mat.maktx}}</text></view>
+ <view class="form-item-content" style="word-break: break-all;line-height: 1.5;">
+ <text>{{mat.maktx}}</text>
+ </view>
</view>
<view class="form-item">
<view class="form-item-desc"><text>瑙勬牸</text></view>
<view class="form-item-content"><text>{{mat.specs}}</text></view>
</view>
<view class="form-item">
- <view class="form-item-desc"><text>鎵瑰彿</text></view>
+ <view class="form-item-desc"><text>渚涘簲鍟嗕唬鐮�</text></view>
<view class="form-item-content">
<view class="form-input">
- <input type="text" v-model="mat.batch">
+ <input type="text" v-model="mat.standby1">
</view>
</view>
</view>
@@ -52,8 +54,8 @@
},
selectNum: null,
mats: null,
- baseIP:'',
- basePORT:'',
+ baseIP: '',
+ basePORT: '',
}
},
onLoad(option) {
@@ -64,20 +66,20 @@
// #ifndef APP-NVUE
const eventChannel = this.getOpenerEventChannel();
// #endif
-
+
// 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
eventChannel.on('mat', function(data) {
that.mats = data.data
})
-
-
+
+
},
methods: {
blur() {
-
+
},
focus() {
-
+
},
changeValue(value) {
this.mats[0].anfme = value
@@ -85,7 +87,11 @@
},
back() {
if (this.mats[0].anfme === 0) {
- uni.showToast({title: '璇疯緭鍏ユ暟閲�', icon: "none", position: 'top'});
+ uni.showToast({
+ title: '璇疯緭鍏ユ暟閲�',
+ icon: "none",
+ position: 'top'
+ });
return;
}
console.log("=======>");
@@ -95,9 +101,11 @@
} else {
this.mats[0].anfme = this.mats[0].enableQty
}
- this.getOpenerEventChannel().emit('matList', {data: this.mats[0]});
+ this.getOpenerEventChannel().emit('matList', {
+ data: this.mats[0]
+ });
uni.navigateBack({
-
+
})
}
}
@@ -106,13 +114,15 @@
<style>
@import url('../../static/css/wms.css/wms.css');
+
.form {
min-height: 80rpx;
background-color: #FFF;
margin-top: 10px;
color: #606266;
- box-shadow: 0px 0px 50px 0px rgba(0,0,0,0.2) ;
+ box-shadow: 0px 0px 50px 0px rgba(0, 0, 0, 0.2);
}
+
.form-item {
min-height: 100rpx;
line-height: 1;
@@ -121,16 +131,19 @@
display: flex;
align-items: center;
}
+
.form-item-desc {
width: 30%;
}
+
.form-item-content {
width: 60%;
}
-
+
.form-item:last-child {
border: none;
}
+
.form-input {
display: flex;
align-items: center;
@@ -140,7 +153,8 @@
border-bottom: 1px solid #E4E7ED;
border-radius: 5rpx;
}
- .form-input input{
+
+ .form-input input {
color: #606266;
}
</style>
\ No newline at end of file
diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index 5173e24..94474d3 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -104,7 +104,8 @@
<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" />
+ <uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474"
+ @change="changeValue" />
</view>
</view>
<view class="btn">
@@ -193,7 +194,7 @@
// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
setTimeout(() => {
var len = this.barcode.length
- if (len >= 9 && len <=8) {
+ if (len >= 9 && len <= 8) {
uni.showToast({
title: '鎵樼洏鐮佹湁璇閲嶈瘯',
icon: "none",
@@ -224,13 +225,12 @@
},
// 鎼滅储鐗╂枡
findMat() {
- let that = this
- let m = that.matnr.split(";")
- let matnr1 = m[0].slice(3)
+ let that = this
+
uni.request({
url: that.baseUrl + '/mat/auth',
data: {
- matnr: matnr1
+ matnr: that.matnr
},
header: {
'token': uni.getStorageSync('token')
@@ -246,7 +246,7 @@
// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
success: function(res) {
res.eventChannel.emit('mat', {
- data: result.data
+ data: [result.data]
})
},
// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
@@ -304,7 +304,8 @@
},
checkMat(mat) {
var len = this.dataList.length
- var add = true ,sameItem = false
+ 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++) {
@@ -320,7 +321,7 @@
} else {
add = true
}
-
+
} else {
// 鐩稿悓鐗╂枡鐩稿悓鎵瑰彿 鏁伴噺绱姞
this.dataList[i].anfme += mat.anfme
@@ -348,7 +349,7 @@
},
// 鍒楄〃绉婚櫎鎸夐挳
remove(item, i, type) {
- this.removeNum = i
+ this.removeNum = i
this.msgType = type
this.title = '璀﹀憡'
this.content = '鏄惁绉婚櫎褰撳墠鍟嗗搧!'
@@ -411,7 +412,7 @@
uni.request({
url: that.baseUrl + '/mobile/comb/auth',
data: JSON.stringify({
- barcode: that.barcode,
+ barcode: that.barcode,
combMats: that.dataList
}),
method: 'POST',
@@ -520,7 +521,8 @@
text-align: center;
box-shadow: 0px 0px 30px 0px rgba(0, 0, 0, 0.5);
}
+
.list:first-child {
margin-top: 250rpx;
}
-</style>
+</style>
\ No newline at end of file
--
Gitblit v1.9.1