From 40b7a1d53e96b1af5c2241fa3dcd39ae5a0d9726 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 05 十月 2023 16:43:53 +0800
Subject: [PATCH] #
---
pages/basics/pakin.vue | 34 ++++++++++++++++
pages/basics/orderPakin.vue | 34 ++++++++++++++++-
App.vue | 1
3 files changed, 65 insertions(+), 4 deletions(-)
diff --git a/App.vue b/App.vue
index 8b90a69..bb38eaa 100644
--- a/App.vue
+++ b/App.vue
@@ -604,7 +604,6 @@
}
.title-text {
- /* background-color: #000000; */
display: inline-block;
height: 100rpx;
width: 250rpx;
diff --git a/pages/basics/orderPakin.vue b/pages/basics/orderPakin.vue
index 48030fa..a245e86 100644
--- a/pages/basics/orderPakin.vue
+++ b/pages/basics/orderPakin.vue
@@ -39,11 +39,19 @@
<radio :checked="ck2" style="margin-left: 50rpx;"/><text>鍚�</text>
</label>
</radio-group>
- <!-- <radio :value="yes" style="margin-left: 100rpx;">鏄�</radio>
- <radio :value="no" style="margin-left: 50rpx;">鍚�</radio> -->
</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">
@@ -187,6 +195,9 @@
check:false,
checkText:'鍏ㄩ��',
checkedData:[],
+ matType: '',
+ matTypes: ['鍗曞搧鐗╂枡','楂橀娣峰悎鐗╂枡','浣庨娣峰悎鐗╂枡'],
+ matTypeId: 0,
batch:'',
memo: '',
cstmr: '',
@@ -313,6 +324,8 @@
this.barcode = ''
this.matnr = ''
this.orderNo = ''
+ this.matType = ''
+ this.matTypeId = 0
this.barcodeFocuss()
uni.vibrateShort();
},
@@ -373,6 +386,7 @@
for (let k in that.matList) {
that.matList[k].anfme = that.matList[k].enterCount
}
+ this.getMatTypeIn(this.matType)
uni.showLoading();
uni.request({
url: that.commonUrl + '/mobile/comb/auth',
@@ -380,6 +394,7 @@
frozen: that.frozen,
barcode: that.barcode,
orderNo: that.orderNo,
+ matTypeIn: that.matTypeId,
combMats: that.matList
}),
method: 'POST',
@@ -419,6 +434,21 @@
}
});
},
+ 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
uni.vibrateShort();
diff --git a/pages/basics/pakin.vue b/pages/basics/pakin.vue
index 083bafe..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">
@@ -175,7 +185,10 @@
ck1: false,
ck2: true,
frozen: 0,
- owner: ''
+ owner: '',
+ matType: '',
+ matTypes: ['鍗曞搧鐗╂枡','楂橀娣峰悎鐗╂枡','浣庨娣峰悎鐗╂枡'],
+ matTypeId: 0,
}
},
onShow() {
@@ -269,6 +282,8 @@
this.matList = []
this.barcode = ''
this.matnr = ''
+ this.matType = ''
+ this.matTypeId = 0
this.barcodeFocuss()
uni.vibrateShort();
},
@@ -318,12 +333,14 @@
}
}
}
+ 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',
@@ -363,6 +380,21 @@
}
});
},
+ 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
uni.vibrateShort();
--
Gitblit v1.9.1