From cc415a70543843db7f9ba0796db09015ae743d44 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 24 六月 2024 16:58:06 +0800
Subject: [PATCH] #
---
pages/mat/matQuery.vue | 5 ++---
pages/pakin/pakin.vue | 52 +++++++++++++++++++++++++++++++++++++++-------------
2 files changed, 41 insertions(+), 16 deletions(-)
diff --git a/pages/mat/matQuery.vue b/pages/mat/matQuery.vue
index dbed4ba..35facf1 100644
--- a/pages/mat/matQuery.vue
+++ b/pages/mat/matQuery.vue
@@ -82,7 +82,7 @@
that.tagList = []
that.matList = []
uni.request({
- url: that.baseUrl + '/mat/search/pda/auth',
+ url: that.baseUrl + '/matCode/list/auth',
data: {
condition: that.condition
},
@@ -91,10 +91,9 @@
'token':uni.getStorageSync('token'),
},
success(result) {
- console.log(result);
var res = result.data
if (res.code === 200 ) {
- that.matList = res.data
+ that.matList = res.data.records
// that.save()
} else if (res.code == 403) {
uni.showToast({title: res.msg, icon: "none", position: 'top'})
diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index 3681135..25bc227 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -4,11 +4,11 @@
<view class="item">
<view class="code-decs">鎵樼洏鐮�:</view>
<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus"
- @input="barcodeInput()">
+ @input="checkedBarcode()">
</view>
<view class="item">
<view class="code-decs">鐗╂枡鐮�:</view>
- <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="matnr" :focus="matFocus" @input="findMat()">
+ <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="matNo" :focus="matFocus" @input="findMat()">
<view class="item-right">
<button></button>
<text style="text-align: right;color: #409EFF;" @click="selectMat()">鎻愬彇+</text>
@@ -84,7 +84,7 @@
<view class="popup-item">
<view class="popup-item-left">缂栫爜:</view>
<view class="popup-item-right">
- <input type="text" v-model="matnr" disabled="true"
+ <input type="text" v-model="matNo" disabled="true"
style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
</view>
</view>
@@ -152,7 +152,7 @@
dataList: [],
count: 0,
rowNum: '',
- matnr: '',
+ matNo: '',
batch: '',
weight: '',
msgType1: 'success',
@@ -175,6 +175,28 @@
this.token = uni.getStorageSync('token');
},
methods: {
+ checkedBarcode() {
+ let that = this
+ uni.request({
+ url: that.baseUrl + '/barcode/auth',
+ data: {
+ barcode: that.barcode,
+ },
+ header: {
+ 'token':uni.getStorageSync('token')
+ },
+ success(result) {
+ console.log(result);
+ var res = result.data
+ if (res.code === 500) {
+ that.barcodeFocuss()
+ uni.showToast({title: res.msg, icon: "none", position: 'top'});
+ } else if(res.code === 200) {
+ that.barcodeInput()
+ }
+ }
+ })
+ },
messageToggle(type) {
this.msgType1 = type
this.$refs.message.open()
@@ -209,7 +231,7 @@
focuss() {
this.focus = false;
setTimeout(() => {
- this.matnr = '';
+ this.matNo = '';
this.matFocus = true;
}, 100);
},
@@ -228,7 +250,7 @@
result = result.data
if (result.code === 200 && result.data) {
that.matData = result.data
- that.matnr = ''
+ that.matNo = ''
that.matData['batch'] = ''
uni.navigateTo({
url: "../mat/matSelected",
@@ -282,20 +304,23 @@
events: {
// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨�
acceptDataFromOpenedPage: function(data) {
- that.matnr = data.data
- that.findMat(that.matnr)
+ that.matNo = data.data
+ that.findMat(that.matNo)
},
},
});
- that.matnr = ''
+ that.matNo = ''
},
checkMat(mat) {
var len = this.dataList.length
var add = true ,sameItem = false
for (var i = 0; i < len; i++) {
- if (mat.matnr == this.dataList[i].matnr) {
+ console.log(i);
+ console.log(mat);
+ console.log(this.dataList[i].matNo);
+ if (mat.matNo == this.dataList[i].matNo) {
for (var j = 0; j < len; j++) {
if (mat.batch == this.dataList[j].batch) {
sameItem = true
@@ -324,7 +349,7 @@
},
// 淇敼鎵瑰彿
revise(item, i) {
- this.matnr = this.dataList[i].matnr
+ this.matNo = this.dataList[i].matNo
this.count = this.dataList[i].anfme
this.batch = this.dataList[i].batch
this.weight = this.dataList[i].weight
@@ -359,7 +384,7 @@
this.dataList[this.rowNum].batch = this.batch
this.dataList[this.rowNum].weight = this.weight
this.dataList[this.rowNum].appeTime$ = this.appeTime$
- this.matnr = ''
+ this.matNo = ''
this.messageText = "淇敼鎴愬姛"
this.messageToggle('success')
this.$refs.revise.close()
@@ -394,10 +419,11 @@
}
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].matNo + '缁勬墭鏁伴噺涓嶈兘涓�0'
this.messageToggle('error')
return;
}
+ this.dataList[i].count = that.dataList[i].anfme
}
uni.request({
url: that.baseUrl + '/mobile/comb/auth',
--
Gitblit v1.9.1