From 30d021f5c72ecfff7e54af3342607f043a8f9d5a Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 14 十二月 2023 14:23:48 +0800
Subject: [PATCH] #
---
pages/home/home.vue | 58 ++--
pages/mat/matSelected.vue | 2
pages/pakin/goodsUp.vue | 535 ++++++++++++++++++++++------------------
pages/pakin/goodsDown.vue | 104 ++++++-
pages/pakin/goodsUp2.vue | 35 +-
pages.json | 2
6 files changed, 434 insertions(+), 302 deletions(-)
diff --git a/pages.json b/pages.json
index 6a4c4f8..b3c3b8c 100644
--- a/pages.json
+++ b/pages.json
@@ -45,7 +45,7 @@
{
"path": "pages/pakin/goodsUp2",
"style": {
- "navigationBarTitleText": "骞冲簱涓婃灦"
+ "navigationBarTitleText": "鏉＄爜涓婃灦"
}
},
{
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 350dcf6..0080ca0 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -32,7 +32,7 @@
url: '/pakin/goodsUp'
},
{
- title: '骞冲簱涓婃灦',
+ title: '鏉＄爜涓婃灦',
name: 'GoodsUp',
color: 'cyan',
cuIcon: 'pullup',
@@ -122,34 +122,34 @@
cuIcon: 'order',
url: '/loc/locMove'
},
- {
- title: '鍟嗗搧鎵撳嵃',
- name: 'matList',
- color: 'orange',
- cuIcon: 'post',
- url: '/mat/matList'
- },
- {
- title: '琛ヨ揣',
- name: 'restock',
- color: 'yellow',
- cuIcon: 'punch',
- url: '/stock/restock'
- },
- {
- title: '杞叏鏉�',
- name: 'piking',
- color: 'olive',
- cuIcon: 'order',
- url: '/pakin/piking'
- },
- {
- title: '鎹㈡澘缁戝畾',
- name: 'changePallet',
- color: 'green',
- cuIcon: 'order',
- url: '/stock/changePallet'
- },
+ // {
+ // title: '鍟嗗搧鎵撳嵃',
+ // name: 'matList',
+ // color: 'orange',
+ // cuIcon: 'post',
+ // url: '/mat/matList'
+ // },
+ // {
+ // title: '琛ヨ揣',
+ // name: 'restock',
+ // color: 'yellow',
+ // cuIcon: 'punch',
+ // url: '/stock/restock'
+ // },
+ // {
+ // title: '杞叏鏉�',
+ // name: 'piking',
+ // color: 'olive',
+ // cuIcon: 'order',
+ // url: '/pakin/piking'
+ // },
+ // {
+ // title: '鎹㈡澘缁戝畾',
+ // name: 'changePallet',
+ // color: 'green',
+ // cuIcon: 'order',
+ // url: '/stock/changePallet'
+ // },
{
title: '閫�鍑虹櫥褰�',
name: 'logOut',
diff --git a/pages/mat/matSelected.vue b/pages/mat/matSelected.vue
index a691ddf..5ad83de 100644
--- a/pages/mat/matSelected.vue
+++ b/pages/mat/matSelected.vue
@@ -26,7 +26,7 @@
</view>
</view> -->
<view class="form-item">
- <view class="form-item-desc"><text>鏁伴噺</text></view>
+ <view class="form-item-desc"><text>鍏枻</text></view>
<view class="form-item-content">
<uni-number-box :value="mat.anfme" :max="99999999" :step='0.01' color="#747474" @change="changeValue" />
</view>
diff --git a/pages/pakin/goodsDown.vue b/pages/pakin/goodsDown.vue
index 5d798d0..68c57ca 100644
--- a/pages/pakin/goodsDown.vue
+++ b/pages/pakin/goodsDown.vue
@@ -11,6 +11,8 @@
<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="matnr" :focus="barcodeFocus" @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>
@@ -36,7 +38,7 @@
<uni-tag :text="item.matnr" type="primary" style="width: 350rpx; overflow: auto;"></uni-tag>
</view>
</view>
- <!-- <view class="list-left-item">
+ <view class="list-left-item">
<view class="desc">鍚嶇О锛�</view>
<view class="left-item">{{item.maktx}}</view>
</view>
@@ -50,14 +52,14 @@
<uni-tag :text="item.batch" type="warning"></uni-tag>
</view>
</view>
- <view class="list-left-item">
+ <!-- <view class="list-left-item">
<view class="desc">閲嶉噺锛�</view>
<view class="left-item">
<uni-tag :text="item.weight" type="warning"></uni-tag>
</view>
</view> -->
<view class="list-left-item">
- <view class="desc">鏁伴噺锛�</view>
+ <view class="desc">鍏枻锛�</view>
<view class="left-item">{{item.anfme}}</view>
</view>
</view>
@@ -86,16 +88,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="batch"></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="weight"></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" :step='0.01' :max="9999999" color="#747474" @change="changeValue" />
</view>
@@ -171,11 +173,34 @@
removeNum: 0
}
},
+
onShow() {
this.baseUrl = uni.getStorageSync('baseUrl');
this.token = uni.getStorageSync('token');
},
methods: {
+ selectMat() {
+ let that = this
+ uni.navigateTo({
+ url: "../mat/matQuery",
+ success: function(res) {
+ // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
+ res.eventChannel.emit('commonUrl', {
+ commonUrl: ''
+ })
+ },
+ events: {
+ // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨�
+ acceptDataFromOpenedPage: function(data) {
+ that.matnr = data.data
+ that.findMat(that.matnr)
+ },
+ },
+
+
+ });
+ that.matnr = ''
+ },
messageToggle(type) {
this.msgType1 = type
this.$refs.message.open()
@@ -205,15 +230,57 @@
// 鎼滅储鐗╂枡
findMat() {
let that = this
- if(that.matnr.length < 5){
- that.barcodeFocuss()
- return;
- }
- if(that.orderNo ===''){
- return;
- }
- that.checkMat({"matnr":that.matnr,"anfme":0,"origin":that.orderNo})
- that.barcodeFocuss()
+ uni.request({
+ url: that.baseUrl + '/mat/auth',
+ data: {
+ matnr: that.matnr
+ },
+ header: {
+ 'token': uni.getStorageSync('token')
+ },
+ success(result) {
+ result = result.data
+ if (result.code === 200 && result.data) {
+ that.matData = result.data
+ that.matnr = ''
+ that.matData['batch'] = ''
+ uni.navigateTo({
+ url: "../mat/matSelected",
+ // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
+ success: function(res) {
+ res.eventChannel.emit('mat', {
+ data: result.data
+ })
+ },
+ // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
+ events: {
+ matList: function(data) {
+ that.checkMat(data.data)
+ },
+ },
+ });
+ } else if (result.code == 403) {
+ uni.showToast({
+ title: result.msg,
+ icon: "none",
+ position: 'top'
+ })
+ setTimeout(() => {
+ uni.reLaunch({
+ url: '../login/login'
+ });
+ }, 1000);
+ } else {
+ uni.showToast({
+ title: result.msg,
+ icon: "none",
+ position: 'top'
+ })
+ }
+
+ }
+ });
+
},
checkMat(mat) {
var len = this.dataList.length
@@ -430,4 +497,7 @@
text-align: center;
box-shadow: 0px 0px 30px 0px rgba(0, 0, 0, 0.5);
}
+ .list-left-item{
+ margin-bottom: 2px;
+ }
</style>
\ No newline at end of file
diff --git a/pages/pakin/goodsUp.vue b/pages/pakin/goodsUp.vue
index c5341d3..7ad1284 100644
--- a/pages/pakin/goodsUp.vue
+++ b/pages/pakin/goodsUp.vue
@@ -1,15 +1,14 @@
<template>
<view>
<view class="code">
- <view class="item">
- <view class="code-decs">鍟嗗搧鐮�:</view>
- <input type="text" placeholder=" 鎵爜 / 杈撳叆" :focus="barcodeFocus" v-model="matnr" @input="findMat">
-
+ <!-- <view class="item">
+ <view class="code-decs">鏉＄爜:</view>
+ <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="璇烽�夋嫨鏉ユ簮鍦�" :focus="barcodeFocus" v-model="orderNo" @input="findMat"></uni-combox>
- </view>
+ <uni-combox :candidates="orderNoList" placeholder="璇烽�夋嫨鏉ユ簮鍦�" v-model="origin"></uni-combox>
+ </view> -->
<view class="item">
<view class="code-decs">搴撲綅鐮�:</view>
<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="locNo" >
@@ -25,49 +24,35 @@
</view>
</view>
<view class="mat-list-title">
- <!-- <view style="width: 200rpx;"></view> -->
- <view style="-webkit-flex: 1;flex: 1;">鍟嗗搧鍒楄〃</view>
- <!-- <view style="width: 200rpx;"><button size="mini" type="primary" @click="getChecked">鎻愬彇</button></view> -->
+ 鍟嗗搧鍒楄〃
</view>
<scroll-view>
- <checkbox-group class="list" v-for="(item,i) in dataList" :key="i" @change="checkboxChange">
- <view class="aside">
- <checkbox :value="item.matnr" :checked="item.checked" @click="set(i)"/>
- </view>
- <view class="list-left" style="margin: 0;">
+ <view class="list" v-for="(item,i) in dataList" :key="i">
+ <view class="list-left">
<view class="list-left-item">
<view class="desc">No锛�</view>
<view class="left-item">{{i + 1}}</view>
</view>
-
<view class="list-left-item">
- <view class="desc">鏂欏彿锛�</view>
+ <view class="desc">缂栫爜锛�</view>
<view class="left-item">
- <uni-tag :text="item.matnr" type="primary"></uni-tag>
+ {{item.matnr}}
</view>
</view>
<view class="list-left-item">
- <view class="desc">鏉ユ簮鍦帮細</view>
+ <view class="desc">鍚嶇О锛�</view>
+ <view class="left-item">{{item.maktx}}</view>
+ </view>
+ <view class="list-left-item">
+ <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.specs}}</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="left-item">
- <uni-tag :text="item.batch" type="warning"></uni-tag>
- </view>
- </view>
- <view class="list-left-item">
- <view class="desc">閲嶉噺锛�</view>
- <view class="left-item">
- <uni-tag :text="item.weight" type="warning"></uni-tag>
- </view>
- </view> -->
- <view class="list-left-item">
- <view class="desc">鏁伴噺锛�</view>
+ <view class="desc">鍏枻锛�</view>
<view class="left-item">{{item.anfme}}</view>
</view>
</view>
@@ -75,7 +60,7 @@
<uni-icons type="compose" color="#9add8b" size="24" @click="revise(item,i)"></uni-icons>
<uni-icons type="trash" color="#f58a8a" size="24" @click="remove(item,i,'warn')"></uni-icons>
</view>
- </checkbox-group>
+ </view>
</scroll-view>
<!-- 搴曢儴鎿嶄綔鎸夐挳 -->
<view class="buttom">
@@ -90,25 +75,24 @@
<!-- 鏍囬 -->
<view class="title">淇敼</view>
<view class="popup-item">
- <view class="popup-item-left">鏂欏彿:</view>
+ <view class="popup-item-left">缂栫爜:</view>
<view class="popup-item-right">
- <input type="text" v-model="matnr1" disabled="true"
+ <input type="text" v-model="matnr" disabled="true"
style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
</view>
</view>
<!-- <view class="popup-item">
- <view class="popup-item-left">鎵瑰彿:</view>
- <view class="popup-item-right"><input type="text" v-model="batch"></view>
+ <view class="popup-item-left">搴撲綅:</view>
+ <view class="popup-item-right"><input type="text" v-model="locNo"></view>
</view> -->
<view class="popup-item">
- <view class="popup-item-left">閲嶉噺:</view>
- <view class="popup-item-right"><input type="text" v-model="weight"></view>
+ <view class="popup-item-left">鎵规:</view>
+ <view class="popup-item-right"><input type="text" v-model="batch"></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" :step='0.01' :max="9999999" color="#747474"
- @change="changeValue" />
+ <uni-number-box :value="count" :max="9999999" color="#747474" @change="changeValue" />
</view>
</view>
<view class="btn">
@@ -136,7 +120,7 @@
<view>
<uni-popup ref="combConfirm" type="dialog">
<uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
- @confirm="comb" @close="combClose"></uni-popup-dialog>
+ @confirm="adjust" @close="combClose"></uni-popup-dialog>
</uni-popup>
</view>
<!-- 纭閲嶇疆 -->
@@ -144,12 +128,6 @@
<uni-popup ref="resetConfirm" type="dialog">
<uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
@confirm="resetConfirm" @close="resetClose"></uni-popup-dialog>
- </uni-popup>
- </view>
- <view>
- <!-- 鎻愮ず淇℃伅寮圭獥 -->
- <uni-popup ref="message" type="message">
- <uni-popup-message :type="msgType1" :message="messageText" :duration="2000"></uni-popup-message>
</uni-popup>
</view>
</view>
@@ -161,17 +139,12 @@
return {
baseUrl: '',
token: '',
- order: '',
barcode: '',
- barcodeFocus: '',
dataList: [],
- checkedDataList: [],
count: 0,
rowNum: '',
matnr: '',
- matnr1: '',
batch: '',
- weight: '',
msgType1: 'success',
msgType: 'success',
messageText: '',
@@ -180,50 +153,33 @@
barcodeFocus: true,
matFocus: false,
matData: '',
- removeNum: 0,
+ orderNo:'',
+ locNo:'',
orderNoList: [],
- orderNo: '',
- locNo:''
+ code:'',
+ origin:''
+
}
},
+ onLoad() {
+
+ },
onShow() {
- this.baseUrl = uni.getStorageSync('baseUrl');
- this.token = uni.getStorageSync('token');
- this.getOrderNoList()
- },
+ this.baseUrl = uni.getStorageSync('baseUrl');
+ this.token = uni.getStorageSync('token');
+ this.getOrderNoList()
+ },
methods: {
- set(e) {
- var ck = this.dataList[e].checked
- this.dataList[e].checked = ck ? false:true
- },
- getChecked() {
- var checkedList = []
- for(var i = 0; i < this.dataList.length; i++) {
- var t = !this.dataList[i].checked
- if (this.dataList[i].checked) {
- checkedList.push(this.dataList[i])
- }
- }
- this.dataList = checkedList
- },
- getOrderDet() {
+ findCode(){
let that = this
- uni.request({
- url: that.baseUrl + '/order/list/orderNo',
- data: {orderNo: that.orderNo} ,
- method: 'GET',
- success(res) {
- res = res.data;
- if (res.code === 200) {
- that.dataList = res.data
- for (var i = 0; i < that.dataList.length; i++) {
- that.$set(that.dataList[i],'checked',false)
- }
- }
- }
- })
+ if(that.code.length < 10){
+ that.barcodeFocuss()
+ return;
+ }
},
- checkboxChange: function (e) {
+ messageToggle(type) {
+ this.msgType1 = type
+ this.$refs.message.open()
},
getOrderNoList() {
let that = this
@@ -238,77 +194,256 @@
}
})
},
-
- messageToggle(type) {
- this.msgType1 = type
- this.$refs.message.open()
+ // 鏍规嵁鎵樼洏鐮佹悳绱�
+ search() {
+ let that = this
+ uni.request({
+ url: that.baseUrl + '/manlocDetl/orderNo',
+ header: {
+ 'token':uni.getStorageSync('token')
+ },
+ data: {orderNo: that.orderNo},
+ method:'GET',
+ success(res) {
+ console.log(res);
+ res = res.data
+ if(res.code === 200){
+ for(var i = 0; i < res.data.length;i++){
+ that.dataList.push(res.data[i])
+ }
+ } else if (res.code == 403) {
+ uni.showToast({title: res.msg, icon: "none", position: 'top'})
+ setTimeout(() => {
+ uni.reLaunch({
+ url: '../login/login'
+ });
+ }, 1000);
+ } else {
+ uni.showToast({title: res.msg, icon: "none",position: 'top'})
+ }
+ }
+
+ })
},
- // barcode input 浜嬩欢
- barcodeInput() {
- // 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
- setTimeout(() => {
- var len = this.barcode.length
- this.focuss()
- }, 200)
- },
+
// 鎵樼洏鐮佹湁璇噸缃�
barcodeFocuss() {
let that = this;
that.barcodeFocus = false;
setTimeout(() => {
- that.matnr = '';
- that.orderNo = ''
+ that.code = '';
that.barcodeFocus = true;
}, 100);
},
// 鍟嗗搧鍏夋爣娓呯┖閲嶇疆
focuss() {
+ // #ifdef APP
+ let that = this;
+ that.focus = false;
setTimeout(() => {
- this.matnr = '';
- this.matFocus = true;
+ that.matnr = '';
+ that.focus = true;
}, 100);
+ // #endif
},
// 鎼滅储鐗╂枡
findMat() {
let that = this
- if(that.matnr.length < 10){
- that.barcodeFocuss()
- return;
- }
- if(that.orderNo ===''){
- return;
- }
- that.checkMat({"matnr":that.matnr,"anfme":0,"origin":that.orderNo})
- that.barcodeFocuss()
+ uni.request({
+ url: that.baseUrl + '/mat/auth',
+ data: {
+ matnr: that.matnr
+ },
+ header: {
+ 'token': uni.getStorageSync('token')
+ },
+ success(result) {
+ result = result.data
+ if (result.code === 200 && result.data) {
+ that.matData = result.data
+ that.matnr = ''
+ that.matData['batch'] = ''
+ uni.navigateTo({
+ url: "../mat/matSelected",
+ // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
+ success: function(res) {
+ res.eventChannel.emit('mat', {
+ data: result.data
+ })
+ },
+ // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
+ events: {
+ matList: function(data) {
+ that.checkMat(data.data)
+ },
+ },
+ });
+ } else if (result.code == 403) {
+ uni.showToast({
+ title: result.msg,
+ icon: "none",
+ position: 'top'
+ })
+ setTimeout(() => {
+ uni.reLaunch({
+ url: '../login/login'
+ });
+ }, 1000);
+ } else {
+ uni.showToast({
+ title: result.msg,
+ icon: "none",
+ position: 'top'
+ })
+ }
+
+ }
+ });
+
+ },
+ selectMat() {
+ let that = this
+ uni.navigateTo({
+ url: "../mat/matQuery",
+ success: function(res) {
+ // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
+ res.eventChannel.emit('commonUrl', {
+ commonUrl: ''
+ })
+ },
+ events: {
+ // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨�
+ acceptDataFromOpenedPage: function(data) {
+ that.matnr = data.data
+ that.findMat(that.matnr)
+ },
+ },
+
+
+ });
+ that.matnr = ''
},
checkMat(mat) {
-
var len = this.dataList.length
- var add = true,
- sameItem = false
+ var add = true ,sameItem = false
for (var i = 0; i < len; i++) {
- if (mat.matnr != this.dataList[i].matnr) {
- add = true
- }else{
- add = false
- }
-
+ if (mat.matnr == this.dataList[i].matnr) {
+ for (var j = 0; j < len; j++) {
+ if (mat.batch == this.dataList[j].batch) {
+ sameItem = true
+ }
+ }
+ // 鐩稿悓鐗╂枡 涓嶅悓鎵瑰彿 鏂板姞鍒楄〃
+ if (mat.batch != this.dataList[i].batch) {
+ this.$forceUpdate() // 寮哄埗鍒锋柊
+ if (sameItem) {
+ add = false
+ } else {
+ add = true
+ }
+
+ } else {
+ // 鐩稿悓鐗╂枡鐩稿悓鎵瑰彿 鏁伴噺绱姞
+ this.dataList[i].anfme += mat.anfme
+ this.$forceUpdate() // 寮哄埗鍒锋柊
+ add = false
+ }
+ }
}
if (add) {
this.dataList.unshift(mat)
-
}
-
+ console.log(len);
+ },
+ // 淇敼鎵瑰彿
+ revise(item, i) {
+ this.matnr = this.dataList[i].matnr
+ this.count = this.dataList[i].anfme
+ this.batch = this.dataList[i].batch
+ this.locNo = this.dataList[i].locNo
+ this.rowNum = i
+ this.eject()
+ },
+ eject(type) {
+ this.type = type
+ this.$refs.revise.open(type)
+ },
+ // 鍒楄〃绉婚櫎鎸夐挳
+ remove(item, i, type) {
+ this.msgType = type
+ this.title = '璀﹀憡'
+ this.content = '鏄惁绉婚櫎褰撳墠鍟嗗搧!'
+ this.$refs.alertDialog.open(i)
+ },
+ // 纭绉婚櫎
+ removeConfirm(i) {
+ this.messageText = "绉婚櫎鎴愬姛"
+ this.messageToggle('success')
+ this.dataList.splice(i, 1)
+ },
+ // 鍙栨秷绉婚櫎
+ removeClose() {
+ this.$refs.alertDialog.close()
+ },
+ reviseConfirm() {
+ this.dataList[this.rowNum].anfme = this.count
+ this.dataList[this.rowNum].batch = this.batch
+ this.dataList[this.rowNum].locNo = this.locNo
+ this.messageText = "淇敼鎴愬姛"
+ this.messageToggle('success')
+ this.$refs.revise.close()
+ },
+ reviseClose() {
+ this.$refs.revise.close()
+ },
+ changeValue(value) {
+ this.count = value
},
combConfirm(type) {
this.msgType = type
this.title = '璀﹀憡'
- this.content = '鏄惁鐜板湪缁勬墭!'
+ this.content = '鏄惁纭涓婃灦!'
this.$refs.combConfirm.open()
},
- comb() {
+ combClose() {
+ this.$refs.combConfirm.close()
+ },
+ reset(type) {
+ this.msgType = type
+ this.title = '璀﹀憡'
+ this.content = '鏄惁閲嶇疆!'
+ this.$refs.resetConfirm.open()
+ },
+ // 纭閲嶇疆
+ resetConfirm() {
+ this.dataList = []
+ this.barcode = ''
+ this.messageText = "閲嶇疆瀹屾垚"
+ this.messageToggle('success')
+ },
+ // 鍙栨秷閲嶇疆
+ resetClose() {
+
+ },
+ // 娓呯┖
+ resst() {
+ this.dataList = []
+ this.barcode = ''
+ 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.locNo === '') {
this.messageText = "璇疯緭鍏ュ簱浣嶇爜"
this.messageToggle('error')
@@ -325,11 +460,18 @@
this.messageToggle('error')
return;
}
+ if(that.dataList[i].batch == null || that.dataList[i].batch == ''){
+ this.messageText = that.dataList[i].matnr + '鎵规涓嶈兘涓虹┖'
+ this.messageToggle('error')
+ return;
+ }
}
uni.request({
url: that.baseUrl + '/mobile/manDetl/in/origin',
data: JSON.stringify({
locNo:that.locNo,
+ // code:that.code,
+ // origin:that.origin,
combMats: that.dataList
}),
method: 'POST',
@@ -357,81 +499,6 @@
}
});
},
- reset(type) {
- this.msgType = type
- this.title = '璀﹀憡'
- this.content = '鏄惁閲嶇疆!'
- this.$refs.resetConfirm.open()
- },
- // 纭閲嶇疆
- resetConfirm() {
- this.dataList = []
- this.orderNo = ''
- this.barcode = ''
- this.locNo = ''
- this.messageText = "閲嶇疆瀹屾垚"
- this.messageToggle('success')
- },
- // 鍙栨秷閲嶇疆
- resetClose() {
-
- },
- // 淇敼鎵瑰彿
- revise(item, i) {
- this.matnr1 = this.dataList[i].matnr
- this.count = this.dataList[i].anfme
- this.batch = this.dataList[i].batch
- this.weight = this.dataList[i].weight
- this.rowNum = i
- this.eject()
- },
- eject(type) {
- this.type = type
- this.$refs.revise.open(type)
- },
- // 鍒楄〃绉婚櫎鎸夐挳
- remove(item, i, type) {
- this.removeNum = i
- this.msgType = type
- this.title = '璀﹀憡'
- this.content = '鏄惁绉婚櫎褰撳墠鍟嗗搧!'
- this.$refs.alertDialog.open(i)
- },
- // 纭绉婚櫎
- removeConfirm(i) {
- this.messageText = "绉婚櫎鎴愬姛"
- this.messageToggle('success')
- this.dataList.splice(this.removeNum, 1)
- },
- reviseConfirm() {
- this.dataList[this.rowNum].anfme = this.count
- this.dataList[this.rowNum].batch = this.batch
- this.dataList[this.rowNum].weight = this.weight
- this.messageText = "淇敼鎴愬姛"
- this.messageToggle('success')
- this.$refs.revise.close()
- this.$forceUpdate() // 寮哄埗鍒锋柊
- },
- reviseClose() {
- this.$refs.revise.close()
- },
- changeValue(value) {
- this.count = value
- },
- // 娓呯┖
- resst() {
- this.dataList = []
- this.barcode = ''
- this.locNo = ''
- this.barcodeFocuss()
- },
- combClose() {
- this.$refs.combConfirm.close()
- },
- // 鍙栨秷绉婚櫎
- removeClose() {
- this.$refs.alertDialog.close()
- },
}
}
</script>
@@ -439,35 +506,10 @@
<style>
@import url('../../static/css/wms.css/wms.css');
- .list {
- display: flex;
- min-height: 80rpx;
- background-color: #FFF;
- margin: 20rpx 20rpx;
- border-radius: 20rpx;
- box-shadow: 0px 0px 30px 0px rgba(0, 0, 0, 0.2);
- }
-
- .list:first-child {
- margin-top: 500rpx;
- }
-
- .list:last-child {
- margin-bottom: 120rpx;
- }
-
- .aside {
- width: 100rpx;
- /* background-color: #303133; */
- display: flex;
- align-items: center;
- justify-content: center;
- }
-
.code {
width: 100%;
position: fixed;
- min-height: 400rpx;
+ min-height: 200rpx;
background-color: #FFF;
z-index: 10;
}
@@ -502,18 +544,35 @@
}
.mat-list-title {
- display: flex;
- align-items: center;
height: 80rpx;
+ line-height: 80rpx;
width: 100%;
background-color: white;
position: fixed;
- margin-top: 400rpx;
+ margin-top: 200rpx;
z-index: 9;
/* border-top: 1px solid #DCDFE6; */
text-align: center;
box-shadow: 0px 0px 30px 0px rgba(0, 0, 0, 0.5);
-
-
}
-</style>
\ No newline at end of file
+
+ .list {
+ display: flex;
+ min-height: 80rpx;
+ background-color: #FFF;
+ margin: 20rpx 20rpx;
+ border-radius: 20rpx;
+ box-shadow: 0px 0px 30px 0px rgba(0, 0, 0, 0.2);
+ }
+
+ .list:first-child {
+ margin-top: 320rpx;
+ }
+
+ .list:last-child {
+ margin-bottom: 120rpx;
+ }
+ .list-left-item{
+ margin-bottom: 2px;
+ }
+</style>
diff --git a/pages/pakin/goodsUp2.vue b/pages/pakin/goodsUp2.vue
index 55fe206..de113ad 100644
--- a/pages/pakin/goodsUp2.vue
+++ b/pages/pakin/goodsUp2.vue
@@ -49,7 +49,7 @@
</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 +78,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>
@@ -431,16 +431,16 @@
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')
@@ -564,4 +564,7 @@
.list:last-child {
margin-bottom: 120rpx;
}
+ .list-left-item{
+ margin-bottom: 2px;
+ }
</style>
--
Gitblit v1.9.1