From e4dc67055ea0c21e72815054c044b56a76ec625e Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 17 四月 2024 13:08:36 +0800
Subject: [PATCH] #
---
pages/pakin/goodsUp2.vue | 161 ++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 121 insertions(+), 40 deletions(-)
diff --git a/pages/pakin/goodsUp2.vue b/pages/pakin/goodsUp2.vue
index 55fe206..16561f3 100644
--- a/pages/pakin/goodsUp2.vue
+++ b/pages/pakin/goodsUp2.vue
@@ -6,22 +6,22 @@
<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="code" :focus="barcodeFocus" @input="findCode()">
</view>
<view class="item">
- <view class="code-decs">鏉ユ簮鍦�:</view>
- <uni-combox :candidates="orderNoList" placeholder="璇烽�夋嫨鏉ユ簮鍦�" v-model="origin"></uni-combox>
+ <view class="code-decs">璐т富:</view>
+ <uni-combox :candidates="ownerList" placeholder="璇烽�夋嫨璐т富" v-model="owner"></uni-combox>
</view>
<view class="item">
<view class="code-decs">搴撲綅鐮�:</view>
<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="locNo" >
</view>
- <view class="item">
+ <!-- <view class="item">
<view class="code-decs">鐗╂枡鐮�:</view>
<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="matnr" :focus="matFocus" @input="findMat()">
- <view class="item-right">
- <button></button>
- <text style="text-align: right;color: #409EFF;" @click="selectMat()">鎻愬彇+</text>
- <uni-icons type="right" color="#c1c1c1"></uni-icons>
- </view>
- </view>
+ <view class="item-right"> -->
+ <!-- <button></button> -->
+ <!-- <text style="text-align: right;color: #409EFF;" @click="selectMat()">鎻愬彇+</text> -->
+ <!-- <uni-icons type="right" color="#c1c1c1"></uni-icons> -->
+ <!-- </view>
+ </view> -->
</view>
<view class="mat-list-title">
鍟嗗搧鍒楄〃
@@ -47,9 +47,13 @@
<view class="desc">浜у湴锛�</view>
<view class="left-item">{{item.origin}}</view>
</view>
+ <view class="list-left-item">
+ <view class="desc">鎵规锛�</view>
+ <view class="left-item">{{item.batch}}</view>
+ </view>
<view class="list-left-item">
- <view class="desc">鏁伴噺锛�</view>
+ <view class="desc">鍏枻(鏁伴噺)锛�</view>
<view class="left-item">{{item.anfme}}</view>
</view>
</view>
@@ -78,16 +82,16 @@
style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
</view>
</view>
- <view class="popup-item">
+ <!-- <view class="popup-item">
<view class="popup-item-left">搴撲綅:</view>
<view class="popup-item-right"><input type="text" v-model="locNo"></view>
- </view>
- <view class="popup-item">
+ </view> -->
+ <!-- <view class="popup-item">
<view class="popup-item-left">鎵瑰彿:</view>
<view class="popup-item-right"><input type="text" v-model="batch"></view>
- </view>
+ </view> -->
<view class="popup-item">
- <view class="popup-item-left">鏁伴噺:</view>
+ <view class="popup-item-left">鍏枻:</view>
<view class="popup-item-right" style="border: none;justify-content: center;">
<uni-number-box :value="count" :max="9999999" color="#747474" @change="changeValue" />
</view>
@@ -154,25 +158,78 @@
locNo:'',
orderNoList: [],
code:'',
- origin:''
-
+ origin:'',
+ ownerList: [],
+ owner: ''
}
},
onLoad() {
-
+ // 娌″暐鐢ㄤ簡
+ let that = this
+ // const eventChannel = this.$scope.eventChannel; // 鍏煎APP-NVUE
+ const eventChannel = this.getOpenerEventChannel();
+
+ // 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
+ eventChannel.on('item', function(data) {
+ // console.log(data.item);
+ that.origin = data.item
+ })
},
onShow() {
this.baseUrl = uni.getStorageSync('baseUrl');
this.token = uni.getStorageSync('token');
this.getOrderNoList()
+ this.getOwnerList()
},
methods: {
findCode(){
let that = this
- if(that.code.length < 10){
- that.barcodeFocuss()
- return;
- }
+ uni.request({
+ url: that.baseUrl + '/mobile/manDetl/in/origin/origin',
+ header: { 'token':uni.getStorageSync('token') ,
+ "content-type":"application/x-www-form-urlencoded"},
+ data: {
+ code: that.code,
+ origin: that.origin,
+ },
+ method: 'GET',
+ success(res) {
+ res = res.data
+ if (res.code === 200) {
+ let item = {matnr:res.data.matnr,batch:res.data.batch,weight:res.data.anfme}
+ let matnr = {}
+ that.findMat2(res.data.matnr).then(result=>{
+ result['batch'] = res.data.batch
+ result['anfme'] = res.data.anfme
+ result.weight = res.data.weight
+ that.dataList.push(result)
+ })
+
+ that.barcodeFocus = false
+ setTimeout(()=>{
+ that.code = ''
+ that.barcodeFocus = true
+ })
+ }
+ }
+ })
+ },
+ async findMat2(matnr) {
+ let that = this
+ let item = {}
+ let abb = await uni.request({
+ url: that.baseUrl + '/mat/auth',
+ data: {
+ matnr: matnr
+ },
+ header: {
+ 'token': uni.getStorageSync('token')
+ },
+
+ }).then((result)=> {
+ item = result.data.data
+ })
+ return item
},
messageToggle(type) {
this.msgType1 = type
@@ -188,6 +245,22 @@
for (var i = 0; i < res.data.length; i++) {
that.orderNoList.push(res.data[i])
}
+ }
+ })
+ },
+ getOwnerList(){
+ let that = this
+ uni.request({
+ url: this.baseUrl + '/locOwnerQuery/auth',
+ header: {
+ 'token':uni.getStorageSync('token')
+ },
+ method: 'POST',
+ success(res) {
+ res = res.data
+ res.data.forEach((item,index) => {
+ that.ownerList.push(item.value)
+ })
}
})
},
@@ -271,7 +344,11 @@
// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
events: {
matList: function(data) {
- that.checkMat(data.data)
+ // that.checkMat(data.data)
+ for(let i = 0; i < data.data.count; i++) {
+ // that.checkMat(data.data)
+ that.dataList.unshift(data.data.mat)
+ }
},
},
});
@@ -426,21 +503,23 @@
resst() {
this.dataList = []
this.barcode = ''
+ this.locNo = ''
+ this.owner = ''
this.barcodeFocuss()
},
adjust() {
uni.vibrateShort();
let that = this;
- if (that.code === '') {
- this.messageText = "璇疯緭鍏ユ潯鐮�"
- this.messageToggle('error')
- return;
- }
- if (that.origin === '') {
- this.messageText = "璇烽�夋嫨鏉ユ簮鍦�"
- this.messageToggle('error')
- return;
- }
+ // if (that.code === '') {
+ // this.messageText = "璇疯緭鍏ユ潯鐮�"
+ // this.messageToggle('error')
+ // return;
+ // }
+ // if (that.origin === '') {
+ // this.messageText = "璇烽�夋嫨鏉ユ簮鍦�"
+ // this.messageToggle('error')
+ // return;
+ // }
if (that.locNo === '') {
this.messageText = "璇疯緭鍏ュ簱浣嶇爜"
this.messageToggle('error')
@@ -459,12 +538,11 @@
}
}
uni.request({
- url: that.baseUrl + '/mobile/manDetl/in/origin',
+ url: that.baseUrl + '/mobile/manDetl/in/no/origin',
data: JSON.stringify({
locNo:that.locNo,
- code:that.code,
- origin:that.origin,
- combMats: that.dataList
+ combMats: that.dataList,
+ owner: that.owner
}),
method: 'POST',
header: {
@@ -501,7 +579,7 @@
.code {
width: 100%;
position: fixed;
- min-height: 400rpx;
+ min-height: 300rpx;
background-color: #FFF;
z-index: 10;
}
@@ -541,7 +619,7 @@
width: 100%;
background-color: white;
position: fixed;
- margin-top: 400rpx;
+ margin-top: 300rpx;
z-index: 9;
/* border-top: 1px solid #DCDFE6; */
text-align: center;
@@ -558,10 +636,13 @@
}
.list:first-child {
- margin-top: 500rpx;
+ margin-top: 440rpx;
}
.list:last-child {
margin-bottom: 120rpx;
}
+ .list-left-item{
+ margin-bottom: 2px;
+ }
</style>
--
Gitblit v1.9.1