From 4c4b832d09eb0ff3bbffbe28bdbbd95e7694a565 Mon Sep 17 00:00:00 2001 From: whycq <10027870+whycq@user.noreply.gitee.com> Date: 星期四, 07 九月 2023 17:16:16 +0800 Subject: [PATCH] # --- pages/home/home.vue | 166 ++++++++++++++++++++-------------------- pages/order/orderPutOn.vue | 23 +++-- 2 files changed, 97 insertions(+), 92 deletions(-) diff --git a/pages/home/home.vue b/pages/home/home.vue index 3b9b912..aecdcd7 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -24,13 +24,13 @@ icon: '', elements: [], elements2: [ - { - title: '缁勬墭鍏ュ簱', - name: 'pakin', - color: 'orange', - cuIcon: 'pullup', - url: '/pakin/pakin' - }, + // { + // title: '缁勬墭鍏ュ簱', + // name: 'pakin', + // color: 'orange', + // cuIcon: 'pullup', + // url: '/pakin/pakin' + // }, // { // title: '璁㈠崟缁勬墭', // name: 'orderPakin', @@ -38,90 +38,90 @@ // cuIcon: 'pullup', // url: '/order/orderPakin' // }, + { + title: '缁勬墭涓婃灦', + name: 'putOn', + color: 'cyan', + cuIcon: 'pullup', + url: '/pakin/putOn' + }, // { - // title: '缁勬墭涓婃灦', + // title: '璁㈠崟缁勬墭2', // name: 'putOn', // color: 'cyan', // cuIcon: 'pullup', - // url: '/pakin/putOn' - // }, - { - title: '璁㈠崟缁勬墭2', - name: 'putOn', - color: 'cyan', - cuIcon: 'pullup', - url: '/order/orderPutOn2' - }, - { - title: '璁㈠崟缁勬墭3', - name: 'putOn', - color: 'cyan', - cuIcon: 'pullup', - url: '/order/orderPutOn3' - }, - // { - // title: '鎵撳嵃', - // name: 'print', - // color: 'purple', - // cuIcon: 'text', - // url: '/print/print' + // url: '/order/orderPutOn2' // }, // { - // title: '璁㈠崟涓婃灦', - // name: 'orderPutOn', - // color: 'mauve', + // title: '璁㈠崟缁勬墭3', + // name: 'putOn', + // color: 'cyan', // cuIcon: 'pullup', - // url: '/order/orderPutOn' + // url: '/order/orderPutOn3' // }, - // { - // title: '璁㈠崟涓嬫灦', - // name: 'orderPutDown', - // color: 'pink', - // cuIcon: 'pulldown', - // url: '/order/orderPutDown' - // }, - // { - // title: '搴撳瓨鏌ヨ', - // name: 'stockQuery', - // color: 'brown', - // cuIcon: 'check', - // url: '/stock/stockQuery' - // }, - // { - // title: '鐩樼偣', - // name: 'stockCheck', - // color: 'red', - // cuIcon: 'post', - // url: '/stock/stockCheck' - // }, - // { - // title: '鍟嗗搧鎵撳嵃', - // name: 'matList', - // color: 'orange', - // cuIcon: 'post', - // url: '/mat/matList' - // }, - // { - // title: '琛ヨ揣', - // name: 'restock', - // color: 'yellow', - // cuIcon: 'punch', - // url: '/stock/restock' - // }, - // { - // title: '杞叏鏉�', - // name: 'piking', - // color: 'olive', - // cuIcon: 'order', - // url: '/pakin/piking' - // }, - // { - // title: '鎹㈡澘缁戝畾', - // name: 'changePallet', - // color: 'green', - // cuIcon: 'order', - // url: '/stock/changePallet' - // }, + { + title: '鎵撳嵃', + name: 'print', + color: 'purple', + cuIcon: 'text', + url: '/print/print' + }, + { + title: '璁㈠崟涓婃灦', + name: 'orderPutOn', + color: 'mauve', + cuIcon: 'pullup', + url: '/order/orderPutOn' + }, + { + title: '璁㈠崟涓嬫灦', + name: 'orderPutDown', + color: 'pink', + cuIcon: 'pulldown', + url: '/order/orderPutDown' + }, + { + title: '搴撳瓨鏌ヨ', + name: 'stockQuery', + color: 'brown', + cuIcon: 'check', + url: '/stock/stockQuery' + }, + { + title: '鐩樼偣', + name: 'stockCheck', + color: 'red', + cuIcon: 'post', + url: '/stock/stockCheck' + }, + { + title: '鍟嗗搧鎵撳嵃', + name: 'matList', + color: 'orange', + cuIcon: 'post', + url: '/mat/matList' + }, + { + title: '琛ヨ揣', + name: 'restock', + color: 'yellow', + cuIcon: 'punch', + url: '/stock/restock' + }, + { + title: '杞叏鏉�', + name: 'piking', + color: 'olive', + cuIcon: 'order', + url: '/pakin/piking' + }, + { + title: '鎹㈡澘缁戝畾', + name: 'changePallet', + color: 'green', + cuIcon: 'order', + url: '/stock/changePallet' + }, { title: '閫�鍑虹櫥褰�', name: 'logOut', diff --git a/pages/order/orderPutOn.vue b/pages/order/orderPutOn.vue index 5b69592..b5cd93d 100644 --- a/pages/order/orderPutOn.vue +++ b/pages/order/orderPutOn.vue @@ -121,7 +121,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" @@ -144,9 +144,9 @@ <view> <!-- 鏅�氬脊绐� --> <uni-popup ref="popup" background-color="#fff"> - <view class="popup-content" :class="{ 'popup-height': type === 'left' || type === 'right' }"> + <scroll-view scroll-y="true" class="popup-content" :class="{ 'popup-height': type === 'left' || type === 'right' }"> <view class="recommend" v-for="item in recommendLocs" @click="chose(item)"> {{ item }}</view> - </view> + </scroll-view> </uni-popup> </view> </view> @@ -289,8 +289,10 @@ data: {matnr: that.matnr}, header: {'token': uni.getStorageSync('token')}, success(res) { - res = res.data.data - that.recommendLocs = res + res = res.data + if (res.code == 200 && res.data) { + that.recommendLocs = res.data + } } }) @@ -336,14 +338,14 @@ combConfirm(type) { this.msgType = type this.title = '璀﹀憡' - this.content = '鏄惁鐜板湪缁勬墭!' + this.content = '鏄惁鐜板湪涓婃灦!' this.$refs.combConfirm.open() }, comb() { uni.vibrateShort(); let that = this; if (that.barcode === '') { - this.messageText = "璇锋壂鎻忔墭鐩樻潯鐮�" + this.messageText = "璇锋坊鍔犲簱浣嶇爜" this.messageToggle('error') return; } @@ -354,7 +356,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; } @@ -373,7 +375,7 @@ var res = result.data if (res.code === 200) { that.resst(); - that.messageText = "缁勬墭鎴愬姛" + that.messageText = "涓婃灦鎴愬姛" that.messageToggle('success') } else if (res.code == 403) { that.messageText = res.msg @@ -454,6 +456,7 @@ resst() { this.dataList = [] this.barcode = '' + this.recommendLocs = [] this.barcodeFocuss() }, combClose() { @@ -470,6 +473,8 @@ <style> @import url('../../static/css/wms.css/wms.css'); .popup-content { + /* height: 90vh; */ + height: 90vh; width: 200px; } .recommend { -- Gitblit v1.9.1