From 54fce333aae7d6f596616a6eb5e65c27c28a9994 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 21 八月 2024 12:39:26 +0800
Subject: [PATCH] #
---
pages/basics/pakin.vue | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 53 insertions(+), 2 deletions(-)
diff --git a/pages/basics/pakin.vue b/pages/basics/pakin.vue
index d12a626..dfdf8d4 100644
--- a/pages/basics/pakin.vue
+++ b/pages/basics/pakin.vue
@@ -31,6 +31,16 @@
</view>
</view>
+ <view class="square-1">
+ <view class="square-title" style="display: flex;align-items: center;">
+ <view class="title-sign"><view class="sign"></view></view>
+ <view class="title-text" style="flex: 1;"><text>鍟嗗搧绫诲瀷</text></view>
+ <view style="">
+ <uni-combox style="width: 150px;margin-right: 10px;" :candidates="matTypes" placeholder="璇烽�夋嫨鍟嗗搧绫诲瀷"
+ v-model="matType"></uni-combox>
+ </view>
+ </view>
+ </view>
<view class="square-2">
<view class="square-title">
@@ -75,7 +85,7 @@
<view><text style="width: 400rpx;">瑙勬牸锛歿{item.specs}}</text></view>
<view><text style="width: 400rpx;">鍏ュ簱鍖哄煙锛歿{item.matType$}}</text></view>
<view><text style="width: 400rpx;">鎵瑰彿锛歿{item.batch}}</text></view>
- <view><text style="width: 400rpx;">瀹㈡埛淇℃伅锛歿{item.cstmr}}</text></view>
+ <view><text style="width: 400rpx;">瀹㈡埛淇℃伅锛歿{item.owner}}</text></view>
<view>
<text style="width: 400rpx;">澶囨敞锛歿{item.memo}}</text>
<text style="width: 400rpx;margin-left: 100rpx">鏁伴噺锛歿{item.anfme}}</text>
@@ -175,6 +185,10 @@
ck1: false,
ck2: true,
frozen: 0,
+ owner: '',
+ matType: '',
+ matTypes: ['鍗曞搧鐗╂枡','楂橀娣峰悎鐗╂枡','浣庨娣峰悎鐗╂枡'],
+ matTypeId: 0,
}
},
onShow() {
@@ -268,6 +282,8 @@
this.matList = []
this.barcode = ''
this.matnr = ''
+ this.matType = ''
+ this.matTypeId = 0
this.barcodeFocuss()
uni.vibrateShort();
},
@@ -309,12 +325,22 @@
return;
}
}
+ // 瀹㈡埛淇℃伅涓枃杞暟瀛�
+ for (let k in that.matList) {
+ for (let t in that.owner) {
+ if (that.matList[k].owner == that.owner[t].owner) {
+ that.matList[k].owner = that.owner[t].id
+ }
+ }
+ }
+ this.getMatTypeIn(this.matType)
uni.showLoading();
uni.request({
url: that.commonUrl + '/mobile/comb/auth',
data: JSON.stringify({
frozen: that.frozen,
barcode: that.barcode,
+ matTypeIn: that.matTypeId,
combMats: that.matList
}),
method: 'POST',
@@ -342,10 +368,32 @@
});
}, 1000);
} else {
+ for (let k in that.matList) {
+ for (let t in that.owner) {
+ if (that.matList[k].owner == that.owner[t].id) {
+ that.matList[k].owner = that.owner[t].owner
+ }
+ }
+ }
uni.showToast({title: res.msg, icon: "none",position: 'top'})
}
}
});
+ },
+ getMatTypeIn(type) {
+ switch (type) {
+ case '鍗曞搧鐗╂枡':
+ this.matTypeId = 1
+ break;
+ case '楂橀娣峰悎鐗╂枡':
+ this.matTypeId = 2
+ break;
+ case '浣庨娣峰悎鐗╂枡':
+ this.matTypeId = 3
+ break;
+ default:
+ this.matType = 0
+ }
},
selectMat() {
let that = this
@@ -390,12 +438,15 @@
// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
matList: function(data) {
that.checkMat(data.data)
- // that.matList.push(data.data)
+ },
+ owner: function(data) {
+ that.owner = data.data
},
},
success: function(res) {
// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
res.eventChannel.emit('matData', { data: that.matData })
+ res.eventChannel.emit('url', { data: that.commonUrl })
},
});
} else if (res.code == 403) {
--
Gitblit v1.9.1