From d69d595fbe35a024c46848f0df1ab0f5472e87cf Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 04 四月 2023 09:02:46 +0800
Subject: [PATCH] #
---
pages/basics/outPakin.vue | 208 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 197 insertions(+), 11 deletions(-)
diff --git a/pages/basics/outPakin.vue b/pages/basics/outPakin.vue
index 5f0e843..472e4fe 100644
--- a/pages/basics/outPakin.vue
+++ b/pages/basics/outPakin.vue
@@ -41,11 +41,12 @@
<checkbox-group >
<view v-for="(item,index) in matList" :key="index" class="data-list bg-false" :class="'bg-'+item.checked" >
<view class="data-list-left">
- <view class="matnr">No:{{listLen-index}}</view>
+ <view class="matnr">No:{{listLen-index}} <text style="margin-left: 4em;font-size: 10px;">{{item.memo}}</text></view>
<view class="matnr">{{item.matnr}}-{{item.batch}}</view>
</view>
<view class="data-list-right">
- <uni-icons type="trash" size="20" color="#a5a5a5" @click="remove(item,index)"></uni-icons>
+ <label><uni-icons type="compose" size="20" color="#a5a5a5" @click="revise(item,index)"></uni-icons></label>
+ <label style="margin-left: 10%;"><uni-icons type="trash" size="21" color="#a5a5a5" @click="remove(item,index)"></uni-icons></label>
</view>
</view>
</checkbox-group>
@@ -87,6 +88,27 @@
</view>
</uni-popup>
</view>
+
+ <!-- 寮圭獥 -->
+ <!-- 淇敼鏁伴噺 -->
+ <uni-popup ref="revise" background-color="#fff">
+ <view class="revise-box ">
+ <view class="revise-box-top">
+ <view class="color-block-blue"></view>
+ <text class="title">淇敼</text>
+ </view>
+ <view class="" style="position: relative;left: 40px;margin-bottom: 20px;">
+ <text style="display: inline-block;float: left;width: 45px;line-height: 21px;height: 21px;">缈诲寘锛�</text>
+ <input type="text" style="width: 100px;border-bottom: 1px solid #9e9e9e;float: left;" v-model="memo">
+ </view>
+ <view class="revise-box-buttom">
+ <view>
+ <button class="cu-btn bg-blue" @click="confirm()">纭</button>
+ </view>
+ </view>
+ </view>
+ </uni-popup>
+
</view>
</template>
@@ -112,7 +134,10 @@
origins: [{value:'1288'},{value:'5055'}],
origin: null, // 浠撳簱
current: 0,
- isNum:false
+ isNum:false,
+ memo:'',
+ hide:true
+
}
},
mounted(){
@@ -120,15 +145,18 @@
this.baseIP = UIP;
const UPORT = uni.getStorageSync('UPORT');
this.basePORT = UPORT
- const PJO = uni.getStorageSync('PJO');
- this.baseUrl = PJO
- console.log(this.baseUrl)
+ const PROJ = uni.getStorageSync('UPROJ');
+ this.baseUrl = PROJ
this.getUrl()
},
onLoad() {
// #ifdef APP
setInterval(()=>{
- uni.hideKeyboard()
+ if (this.hide) {
+ uni.hideKeyboard()
+ } else {
+
+ }
},20)
// #endif
},
@@ -147,6 +175,7 @@
},
// 纭鍑哄簱鍙�
check() {
+ console.log(this.matList);
let that = this
if (this.current == 0) {
this.origin = 1288
@@ -282,6 +311,7 @@
},
// 娣诲姞鎵弿鏃ュ織
addLog(matCode,userName) {
+
let that = this;
uni.request({
url: that.commonUrl + "/mobile/addLog/auth",
@@ -294,6 +324,10 @@
},
// method:"POST",
success(result) {
+ var res = result.data
+ if(res.code === 200) {
+ // uni.showToast({title: "娣诲姞鎴愬姛", icon: "none",position: 'center'})
+ }
}
})
@@ -307,6 +341,12 @@
that.addLog(matCode,userName)
// that.foucss();
// return;
+ if(that.matList.length > 15) {
+ that.messageToggle('warn');
+ that.messageText = '缁勬墭鍟嗗搧鏁伴噺宸茶秴杩�16浠讹紝璇峰畬鎴愬綋鍓嶇粍鎵�';
+ that.foucss();
+ return;
+ }
if (that.matnrId.length > 25){
that.messageToggle('warn');
that.messageText = '鍟嗗搧缂栫爜瓒呴暱锛岃閲嶈瘯';
@@ -317,6 +357,31 @@
let matnr = str[0] + '-' + str[1]
// 妫�鏌ユ潯鐮佷腑闈炴暟瀛�
that.checkNum(str[2])
+ // 妫�鏌ュ簭鍒楃爜闀垮害
+ if (str[2].length != 11) {
+ that.messageToggle('warn');
+ that.messageText = '鍟嗗搧搴忓垪鐮侀暱搴︽湁璇紝璇烽噸璇曪紒';
+ that.foucss();
+ return;
+ }
+ // 妫�鏌ュ勾浠�
+ var dt = new Date();
+ var year = (dt.getFullYear() + '').substring(2,4)
+ var month = (dt.getMonth()+1) < 10 ? '0'+ (dt.getMonth()+1) : (dt.getMonth()+1);
+ if (str[2].substring(0,2) > year) {
+ that.messageToggle('warn');
+ that.messageText = '鍟嗗搧搴忓垪鐮佸勾浠芥湁璇紝璇烽噸璇曪紒';
+ that.foucss();
+ return;
+ }
+ // 妫�鏌ユ湀浠�
+ if (str[2].substring(2,4) > 12) {
+ that.messageToggle('warn');
+ that.messageText = '鍟嗗搧搴忓垪鐮佹湀浠芥湁璇紝璇烽噸璇曪紒';
+ that.foucss();
+ return;
+ }
+ if (str)
if (that.isNum == false) {
that.messageToggle('warn');
that.messageText = '鍟嗗搧缂栫爜鏈夎锛岃閲嶈瘯锛�';
@@ -335,15 +400,14 @@
// return;
// uni.showLoading();
uni.request({
- url: that.commonUrl + '/mat/auth',
+ url: that.commonUrl + '/barcode/check/auth',
data: {
- matnr:matnr
+ barcode:that.matnrId
},
header: {
'token':uni.getStorageSync('token')
},
success(result) {
- console.log(result)
uni.hideLoading();
// uni.vibrateShort();
let res = result.data
@@ -390,6 +454,30 @@
change(e) {
console.log('褰撳墠妯″紡锛�' + e.type + ',鐘舵�侊細' + e.show);
},
+ revise(item,index) {
+ 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()
+ },
+ eject(type) {
+ this.hide = false
+ this.type = type
+ // open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦� uni-popup 缁勪欢涓婄粦瀹� type灞炴��
+ this.$refs.revise.open(type)
+ },
+ confirm() {
+ this.matList[this.rowNum].memo = this.memo
+ this.hide = true
+ this.$refs.revise.close()
+ this.$forceUpdate() // 寮哄埗鍒锋柊
+ },
}
}
@@ -403,6 +491,102 @@
/*
*/
+ .revise-box {
+ position: relative;
+ width: 500rpx;
+ height: 400rpx;
+ border-radius: 25px;
+ }
+ .revise-box-top {
+ width: 400rpx;
+ height: 120rpx;
+ border-radius: 25px;
+ }
+ .changeBox {
+ width: 400rpx;
+ height: 100rpx;
+ }
+ .num-box {
+ margin-left: 100rpx;
+ }
+ .revise-box-buttom{
+ margin-left: 190rpx;
+ margin-top: 200rpx;
+ }
+ .pak-seach-box {
+ background-color: #FFFFFF;
+ margin: 15rpx 15rpx 0rpx 15rpx;
+ width: 96%;
+ height: 150rpx;
+ border-radius: 20rpx;
+ }
+ .box-top{
+ display: block;
+ height: 60rpx;
+ width: 720rpx;
+ }
+ .color-block-blue {
+ background-color: #1E9FFF;
+ display: inline-block;
+ float: left;
+ margin: 15rpx 15rpx 0 15rpx;
+ width: 12rpx;
+ height: 40rpx;
+ border: 5rpx solid #1E9FFF;
+ border-radius: 20rpx;
+ }
+ .title {
+ display: inline-block;
+ float: left;
+ font-size: 34rpx;
+ font-weight: 700;
+ height: 50rpx;
+ line-height: 50rpx;
+ margin-top: 10rpx;
+ }
+ .box-buttom {
+ display: inline-block;
+ background-color: #ededed;
+ width: 65%;
+ height: 60rpx;
+ border-radius: 20rpx;
+ margin: 15rpx 15rpx 0rpx 15rpx;
+ }
+ .box-buttom input {
+ width: 75%;
+ float: left;
+ margin: 8rpx 10rpx 0rpx 25rpx;
+ }
+ .box-buttom .search-icon{
+ width: 60rpx;
+ height: 60rpx;
+ float: right;
+ margin-top: 5rpx;
+ margin-right: 10rpx;
+ }
+ /* .pak-seach-box input {
+ background-color: #ededed;
+ border: 1rpx solid #d8d8d8;
+ display: inline-block;
+ border-radius: 20rpx;
+ float: left;
+ width: 70%;
+ height: 60rpx;
+ line-height: 60rpx;
+ margin: 15rpx 15rpx 0rpx 15rpx;
+ padding-left: 20rpx;
+ } */
+ .pak-seach-box button {
+ background-color: #1E9FFF;
+ color: #ffffff;
+ display: inline-block;
+ float: right;
+ width: 180rpx;
+ height: 60rpx;
+ margin: 15rpx 15rpx 0rpx 15rpx;
+ line-height: 60rpx;
+ }
+
.pop-btn {
position: absolute;
width: 100%;
@@ -541,6 +725,8 @@
float: right;
height: 130rpx;
line-height: 130rpx;
- margin-right: 10%;
+ margin-right: 2%;
+ width: 20%;
}
+
</style>
\ No newline at end of file
--
Gitblit v1.9.1