From 5b3408993c2f3ddf3e958b92c71decfd35fa5187 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 18 三月 2024 15:18:11 +0800
Subject: [PATCH] #
---
pages/tzsk/AGV/AGVPakin.vue | 71 ++++++-----------------------------
pages.json | 6 +-
pages/home/menuHome.vue | 6 +-
pages/home/inOutManage.vue | 4 +-
static/css/wms.css/wms.css | 6 +--
5 files changed, 23 insertions(+), 70 deletions(-)
diff --git a/pages.json b/pages.json
index 470c1e7..320261f 100644
--- a/pages.json
+++ b/pages.json
@@ -63,7 +63,7 @@
{
"path": "pages/tzsk/AGV/AGVPakin",
"style": {
- "navigationBarTitleText": "AGV缁勬墭"
+ "navigationBarTitleText": "绌烘澘鍏ュ簱"
}
},
{
@@ -356,10 +356,10 @@
}
},
{
- "path" : "pages/home/agvManage",
+ "path" : "pages/home/inOutManage",
"style" :
{
- "navigationBarTitleText" : "AGV绠＄悊",
+ "navigationBarTitleText" : "鍏ュ嚭搴撶鐞�",
"enablePullDownRefresh" : false
}
},
diff --git a/pages/home/agvManage.vue b/pages/home/inOutManage.vue
similarity index 98%
rename from pages/home/agvManage.vue
rename to pages/home/inOutManage.vue
index 8b596df..9a69b2e 100644
--- a/pages/home/agvManage.vue
+++ b/pages/home/inOutManage.vue
@@ -26,8 +26,8 @@
project: 'tzsk',
elements2: [
{
- title: 'AGV缁勬墭',
- name: 'AGVPakin',
+ title: '绌烘澘鍏ュ簱',
+ name: 'emptyIn',
color: 'blue',
// cuIcon: 'pullup',
url: `/tzsk/AGV/AGVPakin`
diff --git a/pages/home/menuHome.vue b/pages/home/menuHome.vue
index 141a272..de7e801 100644
--- a/pages/home/menuHome.vue
+++ b/pages/home/menuHome.vue
@@ -26,11 +26,11 @@
project: 'tzsk',
elements2: [
{
- title: 'AGV绠＄悊',
- name: 'AGVManage',
+ title: '鍏ュ嚭搴撶鐞�',
+ name: 'inOutManage',
color: 'cyan',
// cuIcon: 'pullup',
- url: `/home/agvManage`
+ url: `/home/inOutManage`
},
// {
// title: '娴嬭瘯',
diff --git a/pages/tzsk/AGV/AGVPakin.vue b/pages/tzsk/AGV/AGVPakin.vue
index 0358ff6..942c1d7 100644
--- a/pages/tzsk/AGV/AGVPakin.vue
+++ b/pages/tzsk/AGV/AGVPakin.vue
@@ -2,64 +2,23 @@
<view>
<view class="code">
<view class="item">
- <view class="code-decs">璁㈠崟鍙�:</view>
+ <view class="code-decs">绔欑偣鐮�:</view>
<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.matnr" 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="desc">绔欑偣鐘舵�侊細</view>
<view class="left-item">{{item.maktx}}</view>
</view>
<view class="list-left-item">
@@ -83,16 +42,12 @@
<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">
<button size="mini" @click="reset('warn')">閲嶇疆</button>
- <button size="mini" type="primary" @click="combConfirm('warn')">缁勬墭</button>
+ <button size="mini" type="primary" @click="combConfirm('warn')">绌烘澘鍏ュ簱</button>
</view>
<!-- 寮圭獥 -->
<!-- 淇敼鏁伴噺 -->
@@ -143,7 +98,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 +127,7 @@
token: '',
barcode: '',
orderNo: '',
- dataList: [],
+ dataList: [{}],
count: 0,
rowNum: '',
matnr: '',
@@ -484,7 +439,7 @@
combConfirm(type) {
this.msgType = type
this.title = '璀﹀憡'
- this.content = '鏄惁鐜板湪缁勬墭!'
+ this.content = '鏄惁鐜板湪绌烘澘鍏ュ簱!'
this.$refs.combConfirm.open()
},
combClose() {
@@ -510,7 +465,7 @@
// }
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;
}
@@ -537,7 +492,7 @@
that.findOrder()
// that.resst();
that.barcode = ''
- that.messageText = "缁勬墭鎴愬姛"
+ that.messageText = "绌烘澘鍏ュ簱鎴愬姛"
that.messageToggle('success')
const innerAudioContext = uni.createInnerAudioContext();
innerAudioContext.src = '/static/music/pakinOk.mp3';
@@ -602,12 +557,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;
}
diff --git a/static/css/wms.css/wms.css b/static/css/wms.css/wms.css
index 5829924..6c529ab 100644
--- a/static/css/wms.css/wms.css
+++ b/static/css/wms.css/wms.css
@@ -3,6 +3,7 @@
min-height: 80rpx;
background-color: #FFF;
margin: 20rpx 20rpx;
+ padding: 20rpx;
border-radius: 20rpx;
box-shadow: 0px 0px 30px 0px rgba(0,0,0,0.2);
}
@@ -15,25 +16,22 @@
.list-left {
display: flex;
flex-direction: column;
- margin-left: 20rpx;
width: 80vw;
}
.list-left-item {
min-height: 40rpx;
line-height: 40rpx;
display: flex;
+ padding: 2rpx;
}
.desc {
min-height: 40rpx;
display: flex;
align-items: center;
- width: 25%;
}
.left-item {
display: flex;
flex-wrap: wrap;
- width: 75%;
- margin: 1px 1px 1px 1px;
/* color: #409EFF; */
}
.left-item input {
--
Gitblit v1.9.1