From 90d5a80d327169b7ead1988a372792858368c88b Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 04 五月 2023 15:34:57 +0800
Subject: [PATCH] #
---
pages/basics/pakin.vue | 110 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 78 insertions(+), 32 deletions(-)
diff --git a/pages/basics/pakin.vue b/pages/basics/pakin.vue
index 06603a2..de44ba2 100644
--- a/pages/basics/pakin.vue
+++ b/pages/basics/pakin.vue
@@ -32,13 +32,25 @@
</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>
+ </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>
- <!-- <label v-show="matList.length != 0" style="float: right;margin-right: 20px;margin-top: 13px;"><uni-icons type="trash" size="25" color="#a5a5a5" @click="remove()"></uni-icons></label> -->
</view>
</view>
@@ -49,14 +61,13 @@
<checkbox-group @change="checkbox">
<view v-for="(item,index) in matList" :key="index" class="data-list bg-false" :class="'bg-'+item.checked" >
<view class="data-list-left">
- <!-- <view>
- <checkbox :value="item.id+''" :checked="item.checked" style="display: block;" />
- </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.anfme}}</text>
+ <text style="width: 400rpx;">澶囨敞锛歿{item.memo}}</text>
+ <text style="width: 400rpx;margin-left: 100rpx">鏁伴噺锛歿{item.anfme}}</text>
</view>
</view>
<view class="data-list-right">
@@ -70,12 +81,6 @@
<!-- 搴曢儴鎸夐挳 -->
<view class="footer flex justify-around">
- <!-- <label class="label-btn" style="width: 170rpx;">
- <checkbox :checked="check" @click="allChecked()">{{checkText}}</checkbox>
- </label>
- <label class="label-btn" style="width: 100rpx;">
- <text @click="reChecked()">鍙嶉��</text>
- </label> -->
<label class="label-btn" style="width: 150rpx;">
<button class="cu-btn" @click="resst()">閲嶇疆</button>
@@ -84,18 +89,26 @@
<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="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 +123,7 @@
<script>
import permision from "@/common/permission.js"
+ import loginVue from "../login/login.vue";
export default {
data() {
return {
@@ -131,6 +145,11 @@
check:false,
checkText:'鍏ㄩ��',
checkedData:[],
+ batch:'',
+ memo: '',
+ ck1: true,
+ ck2: false,
+ frozen: 0,
}
},
onShow() {
@@ -149,6 +168,19 @@
this.getUrl()
},
methods: {
+ // 鍖呰
+ 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
+ }
+ console.log(this.frozen);
+ },
// 鑾峰彇url
getUrl() {
this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePORT + "/" +this.baseUrl
@@ -189,6 +221,7 @@
resst() {
this.matList = []
this.barcode = ''
+ this.matnr = ''
this.barcodeFocuss()
uni.vibrateShort();
},
@@ -230,6 +263,9 @@
return;
}
}
+ for (var j = 0; j < that.matList.length; j++) {
+ that.matList[j].beBatch = that.frozen
+ }
uni.showLoading();
uni.request({
url: that.commonUrl + '/mobile/comb/auth',
@@ -245,6 +281,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,
@@ -300,6 +339,7 @@
if (res.code === 200 && res.data) {
that.matData = res.data
that.matnr = ''
+ that.matData['batch'] = ''
uni.navigateTo({
url: "matQuery",
events: {
@@ -337,6 +377,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
@@ -345,11 +387,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
@@ -379,13 +423,9 @@
},
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.cstmr = this.matList[index].cstmr
this.rowNum = index
this.eject()
},
@@ -399,6 +439,9 @@
},
confirm() {
this.matList[this.rowNum].anfme = this.count
+ this.matList[this.rowNum].batch = this.batch
+ this.matList[this.rowNum].memo = this.memo
+ this.matList[this.rowNum].cstmr = this.cstmr
this.$refs.revise.close()
this.$forceUpdate() // 寮哄埗鍒锋柊
},
@@ -453,9 +496,12 @@
/* @import "../../colorui/main.css";
@import "../../colorui/icon.css"; */
.revise-box {
- width: 400rpx;
- height: 300rpx;
+ position: relative;
+ width: 500rpx;
+ height: 500rpx;
border-radius: 25px;
+ background-color: #fff;
+ border-radius: 20rpx;
}
.revise-box-top {
width: 400rpx;
@@ -470,7 +516,7 @@
margin-left: 100rpx;
}
.revise-box-buttom{
- margin-left: 130rpx;
+ margin-left: 190rpx;
}
.pak-seach-box {
background-color: #FFFFFF;
@@ -568,7 +614,7 @@
}
.data-list {
border-bottom: 1px solid #d8d8d8;
- height: 180rpx;
+ height: 220rpx;
margin: 15rpx;
border-radius: 20rpx;
}
@@ -576,7 +622,7 @@
margin-top: 20rpx;
}
.data-list:last-child {
- margin-bottom: 120rpx;
+ margin-bottom: 180rpx;
}
/* .data-list-left {
display: inline-block;
@@ -599,8 +645,8 @@
.data-list-right {
display: inline-block;
float: right;
- height: 180rpx;
- line-height: 180rpx;
+ height: 220rpx;
+ line-height: 220rpx;
}
/* display: inline-block;
float: right;
--
Gitblit v1.9.1