From c0b24b804539df3a40a0be613b44562c7e073005 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 20 四月 2023 10:43:46 +0800
Subject: [PATCH] #
---
pages/basics/pakin.vue | 84 +++++++++++++++--------------------------
1 files changed, 31 insertions(+), 53 deletions(-)
diff --git a/pages/basics/pakin.vue b/pages/basics/pakin.vue
index 1767665..afa398f 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">
@@ -48,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>
@@ -65,9 +61,6 @@
<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>
@@ -76,9 +69,6 @@
<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>
@@ -91,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>
@@ -139,7 +123,7 @@
<script>
import permision from "@/common/permission.js"
-import loginVue from "../login/login.vue";
+ import loginVue from "../login/login.vue";
export default {
data() {
return {
@@ -184,11 +168,7 @@
this.getUrl()
},
methods: {
- // 鑾峰彇url
- getUrl() {
- this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePORT + "/" +this.baseUrl
- },
- // 鍐荤粨
+ // 鍖呰
isFrozen() {
var temp = this.ck1
this.ck1 = this.ck2
@@ -199,6 +179,10 @@
} else {
this.frozen = 0
}
+ },
+ // 鑾峰彇url
+ getUrl() {
+ this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePORT + "/" +this.baseUrl
},
// barcode input 浜嬩欢
barcodeInput() {
@@ -278,11 +262,13 @@
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',
data: JSON.stringify({
- frozen: that.frozen,
barcode: that.barcode,
combMats: that.matList
}),
@@ -291,7 +277,6 @@
'token':uni.getStorageSync('token')
},
success(result) {
- console.log(result);
uni.hideLoading();
var res = result.data
if (res.code === 200) {
@@ -401,15 +386,13 @@
}
}
if (add) {
- console.log(mat);
- if(mat.batch == '') {
- mat.batch = today
+ 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
@@ -441,13 +424,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()
},
@@ -463,6 +440,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() // 寮哄埗鍒锋柊
},
@@ -519,7 +497,7 @@
.revise-box {
position: relative;
width: 500rpx;
- height: 470rpx;
+ height: 500rpx;
border-radius: 25px;
background-color: #fff;
border-radius: 20rpx;
@@ -643,7 +621,7 @@
margin-top: 20rpx;
}
.data-list:last-child {
- margin-bottom: 120rpx;
+ margin-bottom: 180rpx;
}
/* .data-list-left {
display: inline-block;
@@ -666,8 +644,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