From fc65b1d8dc534675fd43b7f63ed39f6c9108ddf6 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期四, 10 十一月 2022 13:47:22 +0800
Subject: [PATCH] #
---
pages/basics/pakin.vue | 63 +++++++++++++++++++++++++++----
1 files changed, 55 insertions(+), 8 deletions(-)
diff --git a/pages/basics/pakin.vue b/pages/basics/pakin.vue
index 1a0eeee..a1835f2 100644
--- a/pages/basics/pakin.vue
+++ b/pages/basics/pakin.vue
@@ -14,6 +14,22 @@
</view>
</view>
</view>
+ <view class="square-1">
+ <view class="square-title">
+ <view class="title-sign"><view class="sign"></view></view>
+ <view class="title-text"><text>鏄惁鍐荤粨</text></view>
+ <radio-group @change="isFrozen">
+ <label>
+ <radio :checked="ck1" style="margin-left: 100rpx;"/><text>鏄�</text>
+ </label>
+ <label>
+ <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-2">
@@ -55,6 +71,7 @@
<view class="matnr"><text style="width: 400rpx;">缂栫爜锛歿{item.matnr}}</text></view>
<view><text style="width: 400rpx;">鍝佸悕锛歿{item.maktx}}</text></view>
<view><text style="width: 400rpx;">鎵瑰彿锛歿{item.batch}}</text></view>
+ <view><text style="width: 400rpx;">澶囨敞锛歿{item.memo}}</text></view>
<view>
<text style="width: 400rpx;">鏁伴噺锛歿{item.anfme}}</text>
</view>
@@ -84,23 +101,26 @@
<button class="cu-btn bg-blue " @click="comb()">缁勬墭</button>
</label>
</view>
-
<!-- 寮圭獥 -->
<!-- 淇敼鏁伴噺 -->
- <uni-popup ref="revise" background-color="#fff" @change="change">
+ <uni-popup ref="revise" >
<view class="revise-box ">
<view class="revise-box-top">
<view class="color-block-blue"></view>
- <text class="title">淇敼鎵瑰彿/鏁伴噺</text>
+ <text class="title">淇敼</text>
</view>
<view class="" style="position: relative;left: 50px;margin-bottom: 20px;">
<text style="display: inline-block;float: left;width: 50px;">鎵瑰彿锛�</text>
<input type="text" style="width: 100px;border-bottom: 1px solid #9e9e9e;" v-model="batch">
</view>
+ <view class="" style="position: relative;left: 50px;margin-bottom: 20px;">
+ <text style="display: inline-block;float: left;width: 50px;">澶囨敞锛�</text>
+ <input type="text" style="width: 100px;border-bottom: 1px solid #9e9e9e;" v-model="memo">
+ </view>
<view class="changeBox">
<view class="num-box">
- <text style="display: inline-block;float: left;width: 50px;">鎵瑰彿锛�</text>
- <uni-number-box :value="count" :max="9999" color="#747474" @change="changeValue"/>
+ <text style="display: inline-block;float: left;width: 50px;">鏁伴噺锛�</text>
+ <uni-number-box :value="count" :max="9999999" color="#747474" @change="changeValue"/>
</view>
</view>
<view class="revise-box-buttom">
@@ -136,7 +156,11 @@
check:false,
checkText:'鍏ㄩ��',
checkedData:[],
- batch:''
+ batch:'',
+ memo: '',
+ ck1: false,
+ ck2: true,
+ frozen: 0,
}
},
onShow() {
@@ -158,6 +182,18 @@
// 鑾峰彇url
getUrl() {
this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePORT + "/" +this.baseUrl
+ },
+ // 鍐荤粨
+ isFrozen() {
+ var temp = this.ck1
+ this.ck1 = this.ck2
+ this.ck2 = temp
+ this.frozen = this.ck1
+ if (this.frozen == true) {
+ this.frozen = 1
+ } else {
+ this.frozen = 0
+ }
},
// barcode input 浜嬩欢
barcodeInput() {
@@ -195,6 +231,7 @@
resst() {
this.matList = []
this.barcode = ''
+ this.matnr = ''
this.barcodeFocuss()
uni.vibrateShort();
},
@@ -240,6 +277,7 @@
uni.request({
url: that.commonUrl + '/mobile/comb/auth',
data: JSON.stringify({
+ frozen: that.frozen,
barcode: that.barcode,
combMats: that.matList
}),
@@ -248,9 +286,13 @@
'token':uni.getStorageSync('token')
},
success(result) {
+ console.log(result);
uni.hideLoading();
var res = result.data
if (res.code === 200) {
+ const innerAudioContext = uni.createInnerAudioContext();
+ innerAudioContext.src = '/static/music/pakinOk.mp3';
+ innerAudioContext.play()
that.resst();
uni.showToast({
title: res.msg,
@@ -385,6 +427,8 @@
},
revise(item,index) {
this.count = this.matList[index].anfme
+ this.batch = this.matList[index].batch
+ this.memo = this.matList[index].memo
// var maxCount = this.matList[index].maxCount
// if (maxCount == undefined ) {
// this.matList[index]["maxCount"] = item.enableQty
@@ -406,6 +450,7 @@
confirm() {
this.matList[this.rowNum].anfme = this.count
this.matList[this.rowNum].batch = this.batch
+ this.matList[this.rowNum].memo = this.memo
this.$refs.revise.close()
this.$forceUpdate() // 寮哄埗鍒锋柊
},
@@ -462,8 +507,10 @@
.revise-box {
position: relative;
width: 500rpx;
- height: 400rpx;
+ height: 470rpx;
border-radius: 25px;
+ background-color: #fff;
+ border-radius: 20rpx;
}
.revise-box-top {
width: 400rpx;
@@ -576,7 +623,7 @@
}
.data-list {
border-bottom: 1px solid #d8d8d8;
- height: 180rpx;
+ height: 220rpx;
margin: 15rpx;
border-radius: 20rpx;
}
--
Gitblit v1.9.1