From 6071912923bdc9e8ca3441e5bb35e818b56b461f Mon Sep 17 00:00:00 2001
From: whycq <you@example.com>
Date: 星期五, 17 二月 2023 20:44:00 +0800
Subject: [PATCH] #
---
pages/basics/pakin.vue | 59 +++++++++++++----------------------------------------------
1 files changed, 13 insertions(+), 46 deletions(-)
diff --git a/pages/basics/pakin.vue b/pages/basics/pakin.vue
index 5e167e3..15f6b9d 100644
--- a/pages/basics/pakin.vue
+++ b/pages/basics/pakin.vue
@@ -14,22 +14,6 @@
</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">
@@ -139,6 +123,7 @@
<script>
import permision from "@/common/permission.js"
+ import loginVue from "../login/login.vue";
export default {
data() {
return {
@@ -162,9 +147,6 @@
checkedData:[],
batch:'',
memo: '',
- ck1: false,
- ck2: true,
- frozen: 0,
}
},
onShow() {
@@ -186,18 +168,6 @@
// 鑾峰彇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() {
@@ -281,7 +251,6 @@
uni.request({
url: that.commonUrl + '/mobile/comb/auth',
data: JSON.stringify({
- frozen: that.frozen,
barcode: that.barcode,
combMats: that.matList
}),
@@ -290,7 +259,6 @@
'token':uni.getStorageSync('token')
},
success(result) {
- console.log(result);
uni.hideLoading();
var res = result.data
if (res.code === 200) {
@@ -347,12 +315,12 @@
'token':uni.getStorageSync('token')
},
success(result) {
- console.log(result);
uni.vibrateShort();
let res = result.data
if (res.code === 200 && res.data) {
that.matData = res.data
that.matnr = ''
+ that.matData['batch'] = ''
uni.navigateTo({
url: "matQuery",
events: {
@@ -390,6 +358,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
@@ -398,11 +368,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
@@ -434,13 +406,7 @@
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.cstmr = this.matList[index].cstmr
this.rowNum = index
this.eject()
},
@@ -456,6 +422,7 @@
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() // 寮哄埗鍒锋柊
},
@@ -512,7 +479,7 @@
.revise-box {
position: relative;
width: 500rpx;
- height: 470rpx;
+ height: 500rpx;
border-radius: 25px;
background-color: #fff;
border-radius: 20rpx;
@@ -636,7 +603,7 @@
margin-top: 20rpx;
}
.data-list:last-child {
- margin-bottom: 120rpx;
+ margin-bottom: 180rpx;
}
/* .data-list-left {
display: inline-block;
@@ -659,8 +626,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