From d44a9d2e34f17ba2ad9d8ad915214d86de2e8e00 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期六, 06 五月 2023 11:02:56 +0800
Subject: [PATCH] #
---
pages/order/orderPutDown.vue | 15 ++++-----------
pages/order/orderPakin.vue | 9 +--------
pages/order/orderPutOn.vue | 7 -------
pages/pakin/pakin.vue | 25 ++++++++++++-------------
4 files changed, 17 insertions(+), 39 deletions(-)
diff --git a/pages/order/orderPakin.vue b/pages/order/orderPakin.vue
index 118ae3e..27c1397 100644
--- a/pages/order/orderPakin.vue
+++ b/pages/order/orderPakin.vue
@@ -1,11 +1,6 @@
<template>
<view>
<view class="code">
- <!-- <view class="item">
- <view class="code-decs">璁㈠崟鍙�:</view>
- <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="order" :focus="orderFocus"
- @input="orderInput()" disabled>
- </view> -->
<view class="item">
<view class="code-decs">鎵樼洏鐮�:</view>
<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus"
@@ -148,9 +143,7 @@
baseUrl: '',
token: '',
order: '',
- orderFocus: true,
barcode: '',
- barcodeFocus: '',
dataList: [],
count: 0,
rowNum: '',
@@ -162,7 +155,7 @@
messageText: '',
title: '',
content: '',
- barcodeFocus: false,
+ barcodeFocus: true,
matFocus: false,
matData: ''
}
diff --git a/pages/order/orderPutDown.vue b/pages/order/orderPutDown.vue
index 9753a6c..50e4674 100644
--- a/pages/order/orderPutDown.vue
+++ b/pages/order/orderPutDown.vue
@@ -1,23 +1,16 @@
<template>
<view>
<view class="code">
- <!-- <view class="item">
- <view class="code-decs">璁㈠崟鍙�:</view>
- <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="order" :focus="orderFocus"
- @input="orderInput()" disabled>
- </view> -->
<view class="item">
- <view class="code-decs">鎵樼洏鐮�:</view>
+ <view class="code-decs">搴撲綅鐮�:</view>
<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus"
@confirm="barcodeInput()">
</view>
<view class="item">
- <view class="code-decs">搴撲綅鍙�:</view>
+ <view class="code-decs">鐗╂枡鍙�:</view>
<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="matnr" :focus="matFocus" @input="findMat()">
<view class="item-right">
<button></button>
- <!-- <text style="text-align: right;color: #409EFF;" @click="selectMat()">鎻愬彇+</text> -->
- <!-- <uni-icons type="right" color="#c1c1c1"></uni-icons> -->
</view>
</view>
</view>
@@ -300,9 +293,9 @@
}
}
uni.request({
- url: that.baseUrl + '/mobile/comb/auth',
+ url: that.baseUrl + '/mobile/manDetl/out',
data: JSON.stringify({
- locno: that.barcode,
+ locNo: that.barcode,
combMats: that.dataList
}),
method: 'POST',
diff --git a/pages/order/orderPutOn.vue b/pages/order/orderPutOn.vue
index 49ac8f3..fa71578 100644
--- a/pages/order/orderPutOn.vue
+++ b/pages/order/orderPutOn.vue
@@ -1,11 +1,6 @@
<template>
<view>
<view class="code">
- <!-- <view class="item">
- <view class="code-decs">璁㈠崟鍙�:</view>
- <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="order" :focus="orderFocus"
- @input="orderInput()" disabled>
- </view> -->
<view class="item">
<view class="code-decs">搴撲綅鍙�:</view>
<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus"
@@ -16,8 +11,6 @@
<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="matnr" :focus="matFocus" @input="findMat()">
<view class="item-right">
<button></button>
- <!-- <text style="text-align: right;color: #409EFF;" @click="selectMat()">鎻愬彇+</text> -->
- <!-- <uni-icons type="right" color="#c1c1c1"></uni-icons> -->
</view>
</view>
</view>
diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index cd83df3..1b57437 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -4,7 +4,7 @@
<view class="item">
<view class="code-decs">鎵樼洏鐮�:</view>
<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus"
- @confirm="barcodeInput()">
+ @input="barcodeInput()">
</view>
<view class="item">
<view class="code-decs">鐗╂枡鐮�:</view>
@@ -98,7 +98,7 @@
<!-- 鎻愮ず绐楃ず渚� -->
<uni-popup ref="alertDialog" type="dialog">
<uni-popup-dialog :type="msgType" confirmText="绉婚櫎" :title="title" :content="content"
- @confirm="removeConfirm" @close="removeClose"></uni-popup-dialog>
+ @confirm="removeConfirm()" @close="removeClose"></uni-popup-dialog>
</uni-popup>
</view>
<view>
@@ -143,8 +143,8 @@
content: '',
barcodeFocus: true,
matFocus: false,
- matData: ''
-
+ matData: '',
+ removeNum: 0,
}
},
onLoad() {
@@ -187,14 +187,11 @@
},
// 鍟嗗搧鍏夋爣娓呯┖閲嶇疆
focuss() {
- // #ifdef APP
- let that = this;
- that.focus = false;
+ this.focus = false;
setTimeout(() => {
- that.matnr = '';
- that.focus = true;
+ this.matnr = '';
+ this.matFocus = true;
}, 100);
- // #endif
},
// 鎼滅储鐗╂枡
findMat() {
@@ -225,6 +222,7 @@
events: {
matList: function(data) {
that.checkMat(data.data)
+ that.focuss()
},
},
});
@@ -303,7 +301,6 @@
if (add) {
this.dataList.unshift(mat)
}
- console.log(len);
},
// 淇敼鎵瑰彿
revise(item, i) {
@@ -319,16 +316,17 @@
},
// 鍒楄〃绉婚櫎鎸夐挳
remove(item, i, type) {
+ this.removeNum = i
this.msgType = type
this.title = '璀﹀憡'
this.content = '鏄惁绉婚櫎褰撳墠鍟嗗搧!'
this.$refs.alertDialog.open(i)
},
// 纭绉婚櫎
- removeConfirm(i) {
+ removeConfirm() {
this.messageText = "绉婚櫎鎴愬姛"
this.messageToggle('success')
- this.dataList.splice(i, 1)
+ this.dataList.splice(this.removeNum, 1)
},
// 鍙栨秷绉婚櫎
removeClose() {
@@ -337,6 +335,7 @@
reviseConfirm() {
this.dataList[this.rowNum].anfme = this.count
this.dataList[this.rowNum].batch = this.batch
+ this.matnr = ''
this.messageText = "淇敼鎴愬姛"
this.messageToggle('success')
this.$refs.revise.close()
--
Gitblit v1.9.1