From ea92a004d52ce8a49356d8cf81152f565bae71b7 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 01 二月 2023 09:44:14 +0800
Subject: [PATCH] #
---
pages/basics/pakin.vue | 116 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 88 insertions(+), 28 deletions(-)
diff --git a/pages/basics/pakin.vue b/pages/basics/pakin.vue
index 9dd2588..9093c46 100644
--- a/pages/basics/pakin.vue
+++ b/pages/basics/pakin.vue
@@ -9,9 +9,25 @@
<view class="square-content">
<view class="content-input">
<input v-model="barcode" type="text" placeholder="鎵爜 / 杈撳叆"
- :focus="barcodeFocus" @input="barcodeInput()" placeholder-style="line-height: 85rpx;">
+ :focus="barcodeFocus" @confirm="barcodeInput()" placeholder-style="line-height: 85rpx;">
<uni-icons type="closeempty" size="20" color="#dadada" @click="removeBarcode()"></uni-icons>
</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>
@@ -54,10 +70,16 @@
</view> -->
<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.specs}}</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.anfme}}</text>
+ <text style="width: 400rpx;">澶囨敞锛歿{item.memo}}</text>
+ <text style="width: 400rpx;margin-left: 100rpx">鏁伴噺锛歿{item.anfme}}</text>
</view>
+ <!-- <view>
+ <text style="width: 400rpx;">鏁伴噺锛歿{item.anfme}}</text>
+ </view> -->
</view>
<view class="data-list-right">
<label><uni-icons type="compose" size="20" color="#a5a5a5" @click="revise(item,index)"></uni-icons></label>
@@ -84,18 +106,30 @@
<button class="cu-btn bg-blue " @click="comb()">缁勬墭</button>
</label>
</view>
-
<!-- 寮圭獥 -->
<!-- 淇敼鏁伴噺 -->
- <uni-popup ref="revise" background-color="#fff" @change="change">
- <view class="revise-box">
+ <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="" 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="cstmr">
</view>
<view class="changeBox">
<view class="num-box">
- <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">
@@ -110,6 +144,7 @@
<script>
import permision from "@/common/permission.js"
+import loginVue from "../login/login.vue";
export default {
data() {
return {
@@ -121,7 +156,7 @@
searchBox: 'hide',
pick:'hide',
matnr:'',
- matList:[],
+ matList:[{}],
result: '',
enableQty:'',
count:'',
@@ -131,6 +166,12 @@
check:false,
checkText:'鍏ㄩ��',
checkedData:[],
+ batch:'',
+ memo: '',
+ cstmr: '',
+ ck1: false,
+ ck2: true,
+ frozen: 0,
}
},
onShow() {
@@ -153,6 +194,18 @@
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() {
// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
@@ -163,10 +216,8 @@
this.barcodeFocuss()
return;
}
- if (len == 8) {
- this.focuss()
- }
- },100)
+ this.focuss()
+ },200)
},
// 鎵樼洏鐮佹湁璇噸缃�
barcodeFocuss() {
@@ -191,6 +242,7 @@
resst() {
this.matList = []
this.barcode = ''
+ this.matnr = ''
this.barcodeFocuss()
uni.vibrateShort();
},
@@ -236,6 +288,7 @@
uni.request({
url: that.commonUrl + '/mobile/comb/auth',
data: JSON.stringify({
+ frozen: that.frozen,
barcode: that.barcode,
combMats: that.matList
}),
@@ -247,6 +300,9 @@
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,
@@ -280,7 +336,7 @@
},
success: function(res) {
// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
- res.eventChannel.emit('acceptDataFromOpenerPage', {commonUrl:that.commonUrl })
+ res.eventChannel.emit('commonUrl', {commonUrl:that.commonUrl })
},
});
@@ -302,6 +358,7 @@
if (res.code === 200 && res.data) {
that.matData = res.data
that.matnr = ''
+ that.matData['batch'] = ''
uni.navigateTo({
url: "matQuery",
events: {
@@ -339,6 +396,8 @@
checkMat(mat) {
var len = this.matList.length
var add = true
+ var date = new Date()
+ var today = date.getFullYear() + '/' + (date.getMonth()+1) + '/' + date.getDate()
for (var i = 0; i < len; i++) {
if (mat.matnr == this.matList[i].matnr) {
this.matList[i].anfme += mat.anfme
@@ -347,11 +406,13 @@
}
}
if (add) {
+ if(mat.batch === '' || mat.batch === null) {
+ mat.batch = today
+ }
this.matList.unshift(mat)
}
},
change(e) {
- console.log('褰撳墠妯″紡锛�' + e.type + ',鐘舵�侊細' + e.show);
},
toggle(type) {
this.type = type
@@ -381,13 +442,8 @@
},
revise(item,index) {
this.count = this.matList[index].anfme
- // var maxCount = this.matList[index].maxCount
- // if (maxCount == undefined ) {
- // this.matList[index]["maxCount"] = item.enableQty
- // }
- // this.enableQty = item.enableQty
- // this.count = this.minCount
- // this.maxCount = item.maxCount
+ this.batch = this.matList[index].batch
+ this.memo = this.matList[index].memo
this.rowNum = index
this.eject()
},
@@ -400,8 +456,9 @@
this.count = value
},
confirm() {
- console.log(this.count)
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() // 寮哄埗鍒锋柊
},
@@ -456,9 +513,12 @@
/* @import "../../colorui/main.css";
@import "../../colorui/icon.css"; */
.revise-box {
- width: 400rpx;
- height: 300rpx;
+ position: relative;
+ width: 500rpx;
+ height: 570rpx;
border-radius: 25px;
+ background-color: #fff;
+ border-radius: 20rpx;
}
.revise-box-top {
width: 400rpx;
@@ -473,7 +533,7 @@
margin-left: 100rpx;
}
.revise-box-buttom{
- margin-left: 130rpx;
+ margin-left: 190rpx;
}
.pak-seach-box {
background-color: #FFFFFF;
@@ -571,7 +631,7 @@
}
.data-list {
border-bottom: 1px solid #d8d8d8;
- height: 180rpx;
+ height: 250rpx;
margin: 15rpx;
border-radius: 20rpx;
}
@@ -602,8 +662,8 @@
.data-list-right {
display: inline-block;
float: right;
- height: 180rpx;
- line-height: 180rpx;
+ height: 250rpx;
+ line-height: 250rpx;
}
/* display: inline-block;
float: right;
--
Gitblit v1.9.1