From 26a240a9fde1e7911a69f92b33f9d3e3039cadd5 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 14 九月 2023 10:55:34 +0800
Subject: [PATCH] #
---
pages/home/home.vue | 42 ++++++++++----------
pages/order/orderPutOn.vue | 36 +++++-------------
pages/mat/matQuery.vue | 8 ++--
pages/stock/stockCheck.vue | 24 +++--------
4 files changed, 42 insertions(+), 68 deletions(-)
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 08d317d..f72daf3 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -31,13 +31,13 @@
// cuIcon: 'pullup',
// url: '/pakin/pakin'
// },
- // {
- // title: '璁㈠崟缁勬墭',
- // name: 'orderPakin',
- // color: 'blue',
- // cuIcon: 'pullup',
- // url: '/order/orderPakin'
- // },
+ {
+ title: '璁㈠崟缁勬墭',
+ name: 'orderPakin',
+ color: 'blue',
+ cuIcon: 'pullup',
+ url: '/order/orderPakin'
+ },
{
title: '缁勬墭涓婃灦',
name: 'putOn',
@@ -45,13 +45,13 @@
cuIcon: 'pullup',
url: '/pakin/putOn'
},
- // {
- // title: '璁㈠崟缁勬墭2',
- // name: 'putOn',
- // color: 'cyan',
- // cuIcon: 'pullup',
- // url: '/order/orderPutOn2'
- // },
+ {
+ title: '璁㈠崟缁勬墭2',
+ name: 'putOn',
+ color: 'cyan',
+ cuIcon: 'pullup',
+ url: '/order/orderPutOn2'
+ },
// {
// title: '璁㈠崟缁勬墭3',
// name: 'putOn',
@@ -59,13 +59,13 @@
// cuIcon: 'pullup',
// url: '/order/orderPutOn3'
// },
- {
- title: '鎵撳嵃',
- name: 'print',
- color: 'purple',
- cuIcon: 'text',
- url: '/print/print'
- },
+ // {
+ // title: '鎵撳嵃',
+ // name: 'print',
+ // color: 'purple',
+ // cuIcon: 'text',
+ // url: '/print/print'
+ // },
{
title: '璁㈠崟涓婃灦',
name: 'orderPutOn',
diff --git a/pages/mat/matQuery.vue b/pages/mat/matQuery.vue
index 4a9aae5..7f48ff1 100644
--- a/pages/mat/matQuery.vue
+++ b/pages/mat/matQuery.vue
@@ -153,7 +153,7 @@
return;
}
uni.request({
- url: that.baseUrl + '/mat/list/pda/auth',
+ url: that.baseUrl + '/mat/list/pda/page/auth',
data: {
curr:that.curr,
limit: 20,
@@ -167,12 +167,12 @@
that.tagList = null
var res = result.data
if (res.code === 200) {
- if (res.data != null && res.data.length > 0) {
- let list = res.data
+ if (res.data.records != null && res.data.records.length > 0) {
+ let list = res.data.records
that.matList = that.reload ? list : that.matList.concat(list);
that.curr = that.curr + 1
}
- if (res.data.length == 0) {
+ if (res.data.records.length == 0) {
that.status = 'noMore'
}
that.baColor = "background-color: #1cbbb4;"
diff --git a/pages/order/orderPutOn.vue b/pages/order/orderPutOn.vue
index b5cd93d..3af4379 100644
--- a/pages/order/orderPutOn.vue
+++ b/pages/order/orderPutOn.vue
@@ -2,16 +2,16 @@
<view>
<view class="code">
<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>
</view>
- </view>
- <view class="item">
- <view class="code-decs">搴撲綅鍙�:</view>
- <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus">
- <button v-show="recommendLocs.length" size="mini" type="primary" @click="toggle('right')">鎺ㄨ崘</button>
</view>
</view>
<view class="mat-list-title">
@@ -141,14 +141,6 @@
<uni-popup-message :type="msgType1" :message="messageText" :duration="2000"></uni-popup-message>
</uni-popup>
</view>
- <view>
- <!-- 鏅�氬脊绐� -->
- <uni-popup ref="popup" background-color="#fff">
- <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>
- </scroll-view>
- </uni-popup>
- </view>
</view>
</template>
@@ -177,8 +169,6 @@
matFocus: true,
matData: '',
removeNum: 0,
- type: 'center',
- recommendLocs: []
}
},
onShow() {
@@ -186,21 +176,15 @@
this.token = uni.getStorageSync('token');
},
methods: {
- chose(item) {
- this.barcode = item
- this.$refs.popup.close()
- },
- toggle(type) {
- this.type = type
- // open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦� uni-popup 缁勪欢涓婄粦瀹� type灞炴��
- this.$refs.popup.open(type)
- },
messageToggle(type) {
this.msgType1 = type
this.$refs.message.open()
},
- matnrInput() {
+ // barcode input 浜嬩欢
+ barcodeInput() {
+ // 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
setTimeout(() => {
+ var len = this.barcode.length
this.focuss()
}, 200)
},
@@ -238,6 +222,7 @@
result = result.data
if (result.code === 200 && result.data) {
that.matData = result.data
+ that.matnr = ''
that.matData['batch'] = ''
result.data.batch = matnr[2]
uni.navigateTo({
@@ -251,7 +236,6 @@
// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
events: {
matList: function(data) {
- that.recommendLoc()
that.checkMat(data.data)
that.focuss()
},
diff --git a/pages/stock/stockCheck.vue b/pages/stock/stockCheck.vue
index 58dbaa5..b9e1880 100644
--- a/pages/stock/stockCheck.vue
+++ b/pages/stock/stockCheck.vue
@@ -2,8 +2,8 @@
<view>
<view class="code">
<view class="item">
- <view class="code-decs">鐩樼偣鍗�:</view>
- <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="orderNo" :focus="barcodeFocus"
+ <view class="code-decs">鎵樼洏鐮�:</view>
+ <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus"
@input="search()">
</view>
<view class="item">
@@ -37,8 +37,8 @@
<view class="left-item">{{item.maktx}}</view>
</view>
<view class="list-left-item">
- <view class="desc">搴撲綅锛�</view>
- <view class="left-item">{{item.locNo}}</view>
+ <view class="desc">瑙勬牸锛�</view>
+ <view class="left-item">{{item.specs}}</view>
</view>
<view class="list-left-item">
<view class="desc">鎵瑰彿锛�</view>
@@ -75,10 +75,6 @@
<input type="text" v-model="matnr" disabled="true"
style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
</view>
- </view>
- <view class="popup-item">
- <view class="popup-item-left">搴撲綅:</view>
- <view class="popup-item-right"><input type="text" v-model="locNo"></view>
</view>
<view class="popup-item">
<view class="popup-item-left">鎵瑰彿:</view>
@@ -148,9 +144,6 @@
barcodeFocus: true,
matFocus: false,
matData: '',
- orderNo:'',
- locNo:''
-
}
},
onLoad() {
@@ -169,14 +162,13 @@
search() {
let that = this
uni.request({
- url: that.baseUrl + '/manlocDetl/orderNo',
+ url: that.baseUrl + '/mobile/checkDetl/auth2',
header: {
'token':uni.getStorageSync('token')
},
- data: {orderNo: that.orderNo},
+ data: {barcode: that.barcode},
method:'GET',
success(res) {
- console.log(res);
res = res.data
if(res.code === 200){
for(var i = 0; i < res.data.length;i++){
@@ -331,7 +323,6 @@
this.matnr = this.dataList[i].matnr
this.count = this.dataList[i].anfme
this.batch = this.dataList[i].batch
- this.locNo = this.dataList[i].locNo
this.rowNum = i
this.eject()
},
@@ -359,7 +350,6 @@
reviseConfirm() {
this.dataList[this.rowNum].anfme = this.count
this.dataList[this.rowNum].batch = this.batch
- this.dataList[this.rowNum].locNo = this.locNo
this.messageText = "淇敼鎴愬姛"
this.messageToggle('success')
this.$refs.revise.close()
@@ -406,7 +396,7 @@
let that = this
var combMats = []
var combParam = {}
- combParam['orderNo'] = that.orderNo
+ combParam['barcode'] = that.barcode
combParam['wrkDetls'] = that.dataList
uni.request({
url: that.baseUrl + '/mobile/adjustNew/auth',
--
Gitblit v1.9.1