From d90ef2be7ef8b6d96722311b8fe4493ce3d0d59f Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 28 十二月 2022 10:36:23 +0800
Subject: [PATCH] #
---
pages/basics/pakin.vue | 38 ++++++++++++++++++++++++--------------
1 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/pages/basics/pakin.vue b/pages/basics/pakin.vue
index 89dfe44..6e4a377 100644
--- a/pages/basics/pakin.vue
+++ b/pages/basics/pakin.vue
@@ -18,7 +18,7 @@
<view class="square-title">
<view class="title-sign"><view class="sign"></view></view>
<view class="title-text"><text>鏄惁鍐荤粨</text></view>
- <radio-group @change="cRadio">
+ <radio-group @change="isFrozen">
<label>
<radio :checked="ck1" style="margin-left: 100rpx;"/><text>鏄�</text>
</label>
@@ -70,11 +70,15 @@
</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.memo}}</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>
@@ -135,6 +139,7 @@
<script>
import permision from "@/common/permission.js"
+import loginVue from "../login/login.vue";
export default {
data() {
return {
@@ -160,7 +165,7 @@
memo: '',
ck1: false,
ck2: true,
- yess: false,
+ frozen: 0,
}
},
onShow() {
@@ -183,12 +188,17 @@
getUrl() {
this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePORT + "/" +this.baseUrl
},
- cRadio() {
+ // 鍐荤粨
+ isFrozen() {
var temp = this.ck1
this.ck1 = this.ck2
this.ck2 = temp
- this.yess = this.ck1
- console.log(this.matList);
+ this.frozen = this.ck1
+ if (this.frozen == true) {
+ this.frozen = 1
+ } else {
+ this.frozen = 0
+ }
},
// barcode input 浜嬩欢
barcodeInput() {
@@ -272,6 +282,7 @@
uni.request({
url: that.commonUrl + '/mobile/comb/auth',
data: JSON.stringify({
+ frozen: that.frozen,
barcode: that.barcode,
combMats: that.matList
}),
@@ -342,6 +353,7 @@
if (res.code === 200 && res.data) {
that.matData = res.data
that.matnr = ''
+ that.matData['batch'] = ''
uni.navigateTo({
url: "matQuery",
events: {
@@ -379,6 +391,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
@@ -387,6 +401,9 @@
}
}
if (add) {
+ if(mat.batch === '' || mat.batch === null) {
+ mat.batch = today
+ }
this.matList.unshift(mat)
}
},
@@ -423,13 +440,6 @@
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
- // }
- // this.enableQty = item.enableQty
- // this.count = this.minCount
- // this.maxCount = item.maxCount
this.rowNum = index
this.eject()
},
--
Gitblit v1.9.1