From 4aa1546dda1adf637a8d612c6dc0a535532294b4 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期一, 17 四月 2023 12:28:56 +0800
Subject: [PATCH] #
---
pages/basics/outPakin.vue | 175 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 163 insertions(+), 12 deletions(-)
diff --git a/pages/basics/outPakin.vue b/pages/basics/outPakin.vue
index f69d1ce..6ac8342 100644
--- a/pages/basics/outPakin.vue
+++ b/pages/basics/outPakin.vue
@@ -30,6 +30,15 @@
</view>
</view>
<view class="square-1">
+ <view class="square-title" style="display: flex;">
+ <view class="title-sign"><view class="sign"></view></view>
+ <view class="title-text" style="width: 200rpx;"><text>鎷ユ湁鑰�</text></view>
+ <view style="margin: auto auto;">
+ <uni-combox :candidates="ownerList" placeholder="璇烽�夋嫨鎷ユ湁鑰�" v-model="owner"></uni-combox>
+ </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>
@@ -41,7 +50,7 @@
<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">
@@ -95,11 +104,11 @@
<view class="revise-box ">
<view class="revise-box-top">
<view class="color-block-blue"></view>
- <text class="title">淇敼鎵瑰彿/鏁伴噺</text>
+ <text class="title">淇敼</text>
</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="Rummage">
+ <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>
@@ -135,7 +144,12 @@
origin: null, // 浠撳簱
current: 0,
isNum:false,
- Rummage:''
+ memo:'',
+ hide:true,
+ ownerList: [],
+ ownerList2: '',
+ owner: '浜氬拰',
+ ownerId: 2
}
},
@@ -147,11 +161,16 @@
const PROJ = uni.getStorageSync('UPROJ');
this.baseUrl = PROJ
this.getUrl()
+ this.getOwner()
},
onLoad() {
// #ifdef APP
setInterval(()=>{
- uni.hideKeyboard()
+ if (this.hide) {
+ uni.hideKeyboard()
+ } else {
+
+ }
},20)
// #endif
},
@@ -159,6 +178,34 @@
// 鑾峰彇url
getUrl() {
this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePORT + "/" +this.baseUrl
+ },
+ getOwner() {
+ let that = this
+ uni.request({
+ url: that.commonUrl + '/locOwner/list/auth',
+ header: {'token':uni.getStorageSync('token')},
+ success(result) {
+ for (var i = 0; i < result.data.data.records.length; i++) {
+ if(result.data.data.records[i].id == 1){
+ break
+ }
+ that.ownerList.push(result.data.data.records[i].owner)
+ }
+ that.ownerList2 = result.data.data.records
+ }
+
+ })
+ setTimeout(()=>{
+
+ },100)
+ },
+ getOwnerId(owner) {
+
+ for (var key in this.ownerList2) {
+ if (this.ownerList2[key].owner == owner) {
+ this.ownerId = this.ownerList2[key].id
+ }
+ }
},
radioChange(evt) {
for (let i = 0; i < this.origins.length; i++) {
@@ -182,6 +229,7 @@
data: JSON.stringify({
barcode: that.barcode,
origin: that.origin,
+ owner: 2,
combMats: that.matList
}),
method: 'POST',
@@ -200,6 +248,7 @@
that.barcode = '';
that.matList = '';
that.matList = [];
+ that.owner = '';
that.barcodeFocuss();
} else if (res.code == 403) {
uni.showToast({title: res.msg, icon: "none", position: 'top'})
@@ -255,6 +304,7 @@
this.matnrId = '';
this.matList = [];
this.barcode = '';
+ this.owner = ''
this.barcodeFocuss();
},
removeBarcode() {
@@ -281,9 +331,8 @@
uni.showToast({title: '璇锋坊鍔犲晢鍝佸垪琛�', icon: "none", position: 'top'});
return;
}
- // uni.showLoading();
that.$refs.checkOrigin.open()
-
+ this.getOwnerId(that.owner)
},
// 杈撳叆鐨勪笉鏄暟瀛楃殑鎺掗櫎
checkNum(theObj) {
@@ -449,7 +498,7 @@
console.log('褰撳墠妯″紡锛�' + e.type + ',鐘舵�侊細' + e.show);
},
revise(item,index) {
- this.count = this.matList[index].anfme
+ this.memo = this.matList[index].memo
// var maxCount = this.matList[index].maxCount
// if (maxCount == undefined ) {
// this.matList[index]["maxCount"] = item.enableQty
@@ -460,9 +509,15 @@
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].anfme = this.count
- this.matList[this.rowNum].batch = this.batch
+ this.matList[this.rowNum].memo = this.memo
+ this.hide = true
this.$refs.revise.close()
this.$forceUpdate() // 寮哄埗鍒锋柊
},
@@ -479,6 +534,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%;
--
Gitblit v1.9.1