From e415b37b47de72b80e3d8797b634ada8106656fe Mon Sep 17 00:00:00 2001
From: whycq <you@example.com>
Date: 星期日, 21 五月 2023 18:18:36 +0800
Subject: [PATCH] #
---
pages/basics/pakin.vue | 96 ++++++++++++++++++++++-------------------------
1 files changed, 45 insertions(+), 51 deletions(-)
diff --git a/pages/basics/pakin.vue b/pages/basics/pakin.vue
index ba0639d..060c743 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,21 +61,14 @@
<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.cstmr}}</text></view>
<view>
<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>
@@ -92,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>
@@ -122,10 +105,6 @@
<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">
<text style="display: inline-block;float: left;width: 50px;">鏁伴噺锛�</text>
@@ -144,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 {
@@ -168,7 +147,6 @@
checkedData:[],
batch:'',
memo: '',
- cstmr: '',
ck1: false,
ck2: true,
frozen: 0,
@@ -190,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
@@ -205,6 +179,10 @@
} else {
this.frozen = 0
}
+ },
+ // 鑾峰彇url
+ getUrl() {
+ this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePORT + "/" +this.baseUrl
},
// barcode input 浜嬩欢
barcodeInput() {
@@ -284,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
}),
@@ -344,6 +324,16 @@
},
findMat() {
let that = this
+ for (var i = 0; i < that.matList.length; i++) {
+ if (that.matnr == that.matList[i].matnr) {
+ uni.showToast({title: that.matnr + "褰撳墠鐗╂枡鎻愬彇锛岃鍕块噸澶嶆壂鎻�!", icon: "none",position: 'top'})
+ setTimeout(()=>{
+ that.matnr = '';
+ that.focus = true;
+ }, 100);
+ return;
+ }
+ }
uni.request({
url: that.commonUrl + '/mat/auth',
data: {
@@ -381,12 +371,15 @@
});
}, 1000);
} else {
+ setTimeout(()=>{
+ that.matnr = '';
+ that.focus = true;
+ }, 100);
uni.showToast({title: res.msg, icon: "none",position: 'top'})
}
}
});
-
},
// 娣诲姞鍟嗗搧
@@ -400,14 +393,15 @@
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
+ uni.showToast({title: mat.matnr + "褰撳墠鐗╂枡鎻愬彇锛岃鍕块噸澶嶆壂鎻�!", icon: "none",position: 'top'})
+ // this.matList[i].anfme += mat.anfme
this.$forceUpdate() // 寮哄埗鍒锋柊
add = false
}
}
if (add) {
if(mat.batch === '' || mat.batch === null) {
- mat.batch = today
+ // mat.batch = today
}
this.matList.unshift(mat)
}
@@ -517,7 +511,7 @@
.revise-box {
position: relative;
width: 500rpx;
- height: 570rpx;
+ height: 500rpx;
border-radius: 25px;
background-color: #fff;
border-radius: 20rpx;
@@ -633,7 +627,7 @@
}
.data-list {
border-bottom: 1px solid #d8d8d8;
- height: 250rpx;
+ height: 220rpx;
margin: 15rpx;
border-radius: 20rpx;
}
@@ -641,7 +635,7 @@
margin-top: 20rpx;
}
.data-list:last-child {
- margin-bottom: 120rpx;
+ margin-bottom: 180rpx;
}
/* .data-list-left {
display: inline-block;
@@ -664,8 +658,8 @@
.data-list-right {
display: inline-block;
float: right;
- height: 250rpx;
- line-height: 250rpx;
+ height: 220rpx;
+ line-height: 220rpx;
}
/* display: inline-block;
float: right;
--
Gitblit v1.9.1