From 7947d8e88bbfa1bc434213324c38fad83005a50b Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 14 十二月 2023 15:18:25 +0800
Subject: [PATCH] #
---
pages/mat/matSelected.vue | 4 ++--
pages/pakin/goodsUp.vue | 9 +++++++++
pages/pakin/goodsDown.vue | 6 +++---
3 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/pages/mat/matSelected.vue b/pages/mat/matSelected.vue
index 5ad83de..6f5cf65 100644
--- a/pages/mat/matSelected.vue
+++ b/pages/mat/matSelected.vue
@@ -17,14 +17,14 @@
<view class="form-item-desc"><text>浜у湴</text></view>
<view class="form-item-content"><text>{{mat.origin}}</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" v-model="mat.batch">
</view>
</view>
- </view> -->
+ </view>
<view class="form-item">
<view class="form-item-desc"><text>鍏枻</text></view>
<view class="form-item-content">
diff --git a/pages/pakin/goodsDown.vue b/pages/pakin/goodsDown.vue
index 68c57ca..1c86b81 100644
--- a/pages/pakin/goodsDown.vue
+++ b/pages/pakin/goodsDown.vue
@@ -33,9 +33,9 @@
</view>
</view> -->
<view class="list-left-item">
- <view class="desc">鏂欏彿锛�</view>
+ <view class="desc">缂栫爜锛�</view>
<view class="left-item">
- <uni-tag :text="item.matnr" type="primary" style="width: 350rpx; overflow: auto;"></uni-tag>
+ <view class="left-item">{{item.matnr}}</view>
</view>
</view>
<view class="list-left-item">
@@ -444,7 +444,7 @@
box-shadow: 0px 0px 30px 0px rgba(0,0,0,0.2);
}
.list:first-child {
- margin-top: 410rpx;
+ margin-top:320rpx;
}
.list:last-child {
margin-bottom: 120rpx;
diff --git a/pages/pakin/goodsUp.vue b/pages/pakin/goodsUp.vue
index 7ad1284..b72479d 100644
--- a/pages/pakin/goodsUp.vue
+++ b/pages/pakin/goodsUp.vue
@@ -79,6 +79,7 @@
<view class="popup-item-right">
<input type="text" v-model="matnr" disabled="true"
style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
+
</view>
</view>
<!-- <view class="popup-item">
@@ -274,6 +275,13 @@
// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
events: {
matList: function(data) {
+ if(data.data.batch == "" || data.data.batch == null){
+ const now = new Date();
+ const year = now.getFullYear();
+ const month = now.getMonth() + 1; // 鏈堜唤浠�0寮�濮嬶紝闇�瑕佸姞1
+ const day = now.getDate();
+ data.data.batch = (""+year+month+day)
+ }
that.checkMat(data.data)
},
},
@@ -327,6 +335,7 @@
var len = this.dataList.length
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++) {
if (mat.batch == this.dataList[j].batch) {
--
Gitblit v1.9.1