From ebee55f8489f7ba8430cd3f5b1a7f478ca1d30dd Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 28 九月 2023 16:26:09 +0800
Subject: [PATCH] Merge branch 'jsasrs' of http://47.97.1.152:5880/r/wms_app into jsasrs
---
pages/mat/matSelected.vue | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/pages/mat/matSelected.vue b/pages/mat/matSelected.vue
index d4fe196..c9e866a 100644
--- a/pages/mat/matSelected.vue
+++ b/pages/mat/matSelected.vue
@@ -3,23 +3,27 @@
<view class="form">
<view class="form-item">
<view class="form-item-desc"><text>鍟嗗搧缂栫爜</text></view>
- <view class="form-item-content"><text>{{mat.matnr}}</text></view>
+ <view class="form-item-content"><text>{{mat.matNo}}</text></view>
</view>
<view class="form-item">
<view class="form-item-desc"><text>鍟嗗搧鍚嶇О</text></view>
- <view class="form-item-content"><text>{{mat.maktx}}</text></view>
+ <view class="form-item-content"><text>{{mat.matName}}</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 class="form-item-content"><text>{{mat.str2}}</text></view>
</view>
- <view class="form-item">
+ <!-- <view class="form-item">
<view class="form-item-desc"><text>鎵瑰彿</text></view>
<view class="form-item-content">
<view class="form-input">
- <input type="text">
+ <input type="text" v-model="mat.batch">
</view>
</view>
+ </view> -->
+ <view class="form-item">
+ <view class="form-item-desc"><text>鏃堕棿</text></view>
+ <uni-datetime-picker type="date" v-model="mat.date" @change="changeLog"/>
</view>
<view class="form-item">
<view class="form-item-desc"><text>鏁伴噺</text></view>
@@ -40,11 +44,12 @@
data() {
return {
mat: {
- matnr: null,
- maktx: null,
- specs: null,
+ matNo: null,
+ matName: null,
+ str2: null,
batch: null,
- anfme: null,
+ date: '',
+ anfme: 0,
},
baseIP:'',
basePORT:'',
@@ -74,17 +79,18 @@
focus() {
},
+ changeLog(value) {
+ this.mat.date = value
+ },
changeValue(value) {
this.mat.anfme = value
},
back() {
- console.log(this.mat.anfme);
if (this.mat.anfme === 0) {
uni.showToast({title: '璇疯緭鍏ユ暟閲�', icon: "none", position: 'top'});
return;
}
this.getOpenerEventChannel().emit('matList', {data: this.mat});
- uni.vibrateShort();
uni.navigateBack({
})
@@ -104,7 +110,6 @@
}
.form-item {
height: 100rpx;
- line-height: 100rpx;
border-bottom: 1px solid #DCDFE6;
margin-left: 40rpx;
display: flex;
--
Gitblit v1.9.1