From 955faba262ba361b5ca601db5c30aa7973aba608 Mon Sep 17 00:00:00 2001 From: whycq <10027870+whycq@user.noreply.gitee.com> Date: 星期五, 15 三月 2024 16:14:21 +0800 Subject: [PATCH] # --- pages/mat/matSelected.vue | 3 +-- pages/order/orderPakin.vue | 19 ++++++++++--------- pages/order/orderPutOn.vue | 18 ++++++++++++++---- static/css/wms.css/wms.css | 2 +- 4 files changed, 26 insertions(+), 16 deletions(-) diff --git a/pages/mat/matSelected.vue b/pages/mat/matSelected.vue index 10d3118..8c6260d 100644 --- a/pages/mat/matSelected.vue +++ b/pages/mat/matSelected.vue @@ -62,8 +62,7 @@ // 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� eventChannel.on('mat', function(data) { that.mat = data.data - console.log(data.data); - that.mat.anfme = 1 + that.mat.anfme = data.data.anfme }) diff --git a/pages/order/orderPakin.vue b/pages/order/orderPakin.vue index 3f4d2e2..5700e13 100644 --- a/pages/order/orderPakin.vue +++ b/pages/order/orderPakin.vue @@ -222,9 +222,11 @@ if (matnr[1]) { that.order = matnr[0] that.matnr = matnr[1] - that.batch = matnr[2] ? matnr[2] : '' + if (matnr[2] === null) { + that.batch = '' + matnr[2] = '' + } that.anfme = matnr[3] - } uni.request({ url: that.baseUrl + '/mat/auth', @@ -248,13 +250,11 @@ } that.matData = result.data that.matnr = '' - that.matData['batch'] = '' that.matData['anfme'] = '' - // if (matnr[2] === null) { - // matnr[2] = '' - // } - result.data.batch = matnr[2] ? matnr[2] : '' + if (matnr[2] === null) { + result.data.batch = '' + } result.data.anfme = matnr[3] uni.navigateTo({ url: "../mat/matSelected", @@ -473,12 +473,13 @@ display: flex; min-height: 80rpx; background-color: #FFF; - margin: auto 20rpx; + padding: 10rpx; + margin: 30rpx 20rpx; border-radius: 20rpx; box-shadow: 0px 0px 30px 0px rgba(0,0,0,0.2); } .list:first-child { - margin-top: 410rpx; + margin-top: 340rpx; } .list:last-child { margin-bottom: 120rpx; diff --git a/pages/order/orderPutOn.vue b/pages/order/orderPutOn.vue index 63ad8f0..61f280a 100644 --- a/pages/order/orderPutOn.vue +++ b/pages/order/orderPutOn.vue @@ -221,7 +221,12 @@ if (matnr[1]) { that.order = matnr[0] that.matnr = matnr[1] - } + if (matnr[2] === null) { + that.batch = '' + matnr[2] = '' + } + that.anfme = matnr[3] + } uni.request({ url: that.baseUrl + '/mat/auth', data: { @@ -236,7 +241,11 @@ that.matData = result.data that.matnr = '' that.matData['batch'] = '' - result.data.batch = matnr[2] + that.matData['anfme'] = '' + if (matnr[2] === null) { + result.data.batch = '' + } + result.data.anfme = matnr[3] uni.navigateTo({ url: "../mat/matSelected", // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� @@ -472,12 +481,13 @@ display: flex; min-height: 80rpx; background-color: #FFF; - margin: auto 20rpx; + margin: 30rpx 20rpx; + padding: 10rpx; border-radius: 20rpx; box-shadow: 0px 0px 30px 0px rgba(0,0,0,0.2); } .list:first-child { - margin-top: 410rpx; + margin-top: 340rpx; } .list:last-child { margin-bottom: 120rpx; diff --git a/static/css/wms.css/wms.css b/static/css/wms.css/wms.css index 34210d6..10a72c7 100644 --- a/static/css/wms.css/wms.css +++ b/static/css/wms.css/wms.css @@ -7,7 +7,7 @@ box-shadow: 0px 0px 30px 0px rgba(0,0,0,0.2); } .list:first-child { - margin-top: 420rpx; + margin-top: 320rpx; } .list:last-child { margin-bottom: 120rpx; -- Gitblit v1.9.1