From b730f635a10fbb734f74b6116e6d26e4601e64be Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期六, 23 九月 2023 08:45:19 +0800
Subject: [PATCH] #
---
pages/tzsk/AGV/AGVPakin.vue | 16
pages/home/home.vue | 21
pages.json | 12
pages/tzsk/order/orderPutOn.vue | 493 +++++++++++++++++++++++++
pages/tzsk/pakin/pakin.vue | 583 ++++++++++++++++++++++++++++++
static/css/wms.css/wms.css | 3
6 files changed, 1,117 insertions(+), 11 deletions(-)
diff --git a/pages.json b/pages.json
index 6c49e5d..0ec97f8 100644
--- a/pages.json
+++ b/pages.json
@@ -85,6 +85,18 @@
}
},
{
+ "path": "pages/tzsk/pakin/pakin",
+ "style": {
+ "navigationBarTitleText": "缁勬墭鍏ュ簱"
+ }
+ },
+ {
+ "path": "pages/tzsk/order/orderPutOn",
+ "style": {
+ "navigationBarTitleText": "缁勬墭涓婃灦"
+ }
+ },
+ {
"path": "pages/order/orderPakin",
"style": {
"navigationBarTitleText": "璁㈠崟鍏ュ簱"
diff --git a/pages/home/home.vue b/pages/home/home.vue
index c61b597..7351ac2 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -24,18 +24,25 @@
icon: '',
elements: [],
elements2: [
- // {
- // title: '缁勬墭鍏ュ簱',
- // name: 'pakin',
- // color: 'cyan',
- // cuIcon: 'pullup',
- // url: '/pakin/pakin'
- // },
{
title: '缁勬墭鍏ュ簱',
name: 'pakin',
color: 'cyan',
cuIcon: 'pullup',
+ url: '/tzsk/pakin/pakin'
+ },
+ {
+ title: '缁勬墭涓婃灦',
+ name: 'pakin',
+ color: 'cyan',
+ cuIcon: 'pullup',
+ url: '/tzsk/order/orderPutOn'
+ },
+ {
+ title: '涓存椂鍏ュ簱',
+ name: 'pakin',
+ color: 'cyan',
+ cuIcon: 'pullup',
url: '/pakin/pakin2'
},
{
diff --git a/pages/tzsk/AGV/AGVPakin.vue b/pages/tzsk/AGV/AGVPakin.vue
index 9627810..8326baa 100644
--- a/pages/tzsk/AGV/AGVPakin.vue
+++ b/pages/tzsk/AGV/AGVPakin.vue
@@ -177,6 +177,8 @@
// 鏍规嵁璁㈠崟鍙疯繑鍥炲晢鍝佽鎯�
findOrder() {
let that = this
+ that.tempOrderInfo.csocode = ''
+ that.tempOrderInfo.isoseq = ''
uni.request({
url: that.baseUrl + '/mobile/order/search/orderNo/auth',
header: {'token': uni.getStorageSync('token')},
@@ -186,12 +188,12 @@
success(res) {
res = res.data
if (res.code === 200) {
- if(res.data) {
- for (var i = 0; i < res.data[0].combMats.length; i++) {
+ if(res.data && res.data[0].combMats) {
+ for (let i = 0; i < res.data[0].combMats.length; i++) {
that.checkMat(res.data[0].combMats[i])
}
- that.tempOrderInfo.csocode = res.data[0].combMats.csocode ? res.data[0].combMats.csocode : ''
- that.tempOrderInfo.isoseq = res.data[0].combMats.isoseq ? res.data[0].combMats.isoseq : ''
+ // that.tempOrderInfo.csocode = res.data[0].combMats.csocode ? res.data[0].combMats.csocode : ''
+ // that.tempOrderInfo.isoseq = res.data[0].combMats.isoseq ? res.data[0].combMats.isoseq : ''
} else {
uni.showToast({
title: that.orderNo + '璇锋鏌ヨ鍗曞彿鏄惁姝ｇ‘',
@@ -446,6 +448,11 @@
this.messageToggle('error')
return;
}
+ if (that.dataList.length > 1) {
+ this.messageText = "鍙兘娣诲姞涓�绉嶇墿鏂�"
+ this.messageToggle('error')
+ return;
+ }
for (var i = 0; i < that.dataList.length; i++) {
if (that.dataList[i].anfme == 0 || that.dataList[i].anfme == '') {
this.messageText = that.dataList[i].matnr + '缁勬墭鏁伴噺涓嶈兘涓�0'
@@ -453,6 +460,7 @@
return;
}
}
+ console.log(that.dataList);
uni.request({
url: that.baseUrl + '/agvMobile/comb/auth',
data: JSON.stringify({
diff --git a/pages/tzsk/order/orderPutOn.vue b/pages/tzsk/order/orderPutOn.vue
new file mode 100644
index 0000000..0fabc14
--- /dev/null
+++ b/pages/tzsk/order/orderPutOn.vue
@@ -0,0 +1,493 @@
+<template>
+ <view>
+ <view class="code">
+ <view class="item">
+ <view class="code-decs">鎵樼洏鐮�:</view>
+ <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus" @input="recommendLoc()">
+ <view class="item-right">
+ <button></button>
+ </view>
+ </view>
+ <view class="item">
+ <view class="code-decs">搴撲綅鍙�:</view>
+ <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="locNo" :focus="locNoFocus">
+ <button v-show="recommendLocs.length" size="mini" type="primary" @click="toggle('right')">鎺ㄨ崘</button>
+ </view>
+ </view>
+ <view class="mat-list-title">
+ 鍟嗗搧鍒楄〃
+ </view>
+ <scroll-view>
+ <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="left-item">
+ <uni-tag :text="item.orderNo" type="primary"></uni-tag>
+ </view>
+ </view>
+ <view class="list-left-item">
+ <view class="desc">鏂欏彿锛�</view>
+ <view class="left-item">
+ <uni-tag :text="item.matnr" type="primary"></uni-tag>
+ </view>
+ </view>
+ <view class="list-left-item">
+ <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.specs}}</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="left-item">{{item.anfme}}</view>
+ </view>
+ </view>
+ <view class="list-right">
+ <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>
+ </view>
+ </scroll-view>
+ <!-- 搴曢儴鎿嶄綔鎸夐挳 -->
+ <view class="buttom">
+ <button size="mini" @click="reset('warn')">閲嶇疆</button>
+ <button size="mini" type="primary" @click="combConfirm('warn')">涓婃灦</button>
+ </view>
+ <!-- 寮圭獥 -->
+ <!-- 淇敼鏁伴噺 -->
+ <view>
+ <uni-popup ref="revise" type="dialog">
+ <view class="popup">
+ <!-- 鏍囬 -->
+ <view class="title">淇敼</view>
+ <view class="popup-item">
+ <view class="popup-item-left">鏂欏彿:</view>
+ <view class="popup-item-right">
+ <input type="text" v-model="matnr1" 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> -->
+ <view class="popup-item">
+ <view class="popup-item-left">閲嶉噺:</view>
+ <view class="popup-item-right"><input type="text" v-model="weight"></view>
+ </view>
+ <view class="popup-item">
+ <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>
+ </view>
+ <view class="btn">
+ <view class="btn-left" @click="reviseClose">鍙栨秷</view>
+ <view class="btn-right" @click="reviseConfirm()">淇敼</view>
+ </view>
+ </view>
+ </uni-popup>
+ </view>
+ <!-- 绉婚櫎纭 -->
+ <view>
+ <!-- 鎻愮ず绐楃ず渚� -->
+ <uni-popup ref="alertDialog" type="dialog">
+ <uni-popup-dialog :type="msgType" confirmText="绉婚櫎" :title="title" :content="content"
+ @confirm="removeConfirm" @close="removeClose"></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>
+ <uni-popup ref="combConfirm" type="dialog">
+ <uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
+ @confirm="comb" @close="combClose"></uni-popup-dialog>
+ </uni-popup>
+ </view>
+ <!-- 纭閲嶇疆 -->
+ <view>
+ <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>
+ <!-- 鏅�氬脊绐� -->
+ <uni-popup ref="popup" background-color="#fff">
+ <scroll-view scroll-y="true" class="popup-content" :class="{ 'popup-height': type === 'left' || type === 'right' }">
+ <view class="recommend" v-for="item in recommendLocs" @click="chose(item)"> {{ item }}</view>
+ </scroll-view>
+ </uni-popup>
+ </view>
+ </view>
+</template>
+
+<script>
+ export default {
+ data () {
+ return {
+ baseUrl: '',
+ token: '',
+ order: '',
+ barcode: '',
+ locNo: '',
+ barcodeFocus: '',
+ dataList: [],
+ count: 0,
+ rowNum: '',
+ matnr: '',
+ matnr1: '',
+ batch: '',
+ weight: '',
+ msgType1: 'success',
+ msgType: 'success',
+ messageText: '',
+ title: '',
+ content: '',
+ barcodeFocus: false,
+ locNoFocus: true,
+ matData: '',
+ removeNum: 0,
+ type: 'center',
+ recommendLocs: []
+ }
+ },
+ onShow() {
+ this.baseUrl = uni.getStorageSync('baseUrl');
+ this.token = uni.getStorageSync('token');
+ },
+ methods: {
+ chose(item) {
+ this.locNo = item
+ this.$refs.popup.close()
+ },
+ toggle(type) {
+ this.type = type
+ // open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦� uni-popup 缁勪欢涓婄粦瀹� type灞炴��
+ this.$refs.popup.open(type)
+ },
+ messageToggle(type) {
+ this.msgType1 = type
+ this.$refs.message.open()
+ },
+ matnrInput() {
+ setTimeout(() => {
+ this.focuss()
+ }, 200)
+ },
+ // 鎵樼洏鐮佹湁璇噸缃�
+ barcodeFocuss() {
+ let that = this;
+ that.barcodeFocus = false;
+ setTimeout(() => {
+ that.barcode = '';
+ that.barcodeFocus = true;
+ }, 100);
+ },
+ // 鍟嗗搧鍏夋爣娓呯┖閲嶇疆
+ focuss() {
+ setTimeout(() => {
+ this.matnr = '';
+ this.matFocus = true;
+ }, 100);
+ },
+ // 鎺ㄨ崘搴撲綅
+ recommendLoc() {
+ let that = this
+ that.recommendLocs = []
+ uni.request({
+ url: that.baseUrl + '/mobile/node/recommend/loc',
+ data: {barcode: that.barcode},
+ header: {'token': uni.getStorageSync('token')},
+ method: 'POST',
+ success(res) {
+ res = res.data
+ console.log(res);
+ that.recommendLocs.push('DT-C-010202')
+ return
+ if (res.code == 200 && res.data) {
+ that.recommendLocs = res.data
+ }
+ }
+
+ })
+ },
+ checkMat(mat) {
+ mat['orderNo'] = this.order
+ var len = this.dataList.length
+ var add = true ,sameItem = false
+ for (var i = 0; i < len; i++) {
+ if (mat.orderNo != this.dataList[i].orderNo) {
+ add = true
+ break;
+ } else {
+ 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)
+ }
+ },
+ combConfirm(type) {
+ this.msgType = type
+ this.title = '璀﹀憡'
+ this.content = '鏄惁鐜板湪涓婃灦!'
+ this.$refs.combConfirm.open()
+ },
+ comb() {
+ uni.vibrateShort();
+ let that = this;
+ if (that.barcode === '') {
+ this.messageText = "璇锋坊鍔犲簱浣嶇爜"
+ this.messageToggle('error')
+ return;
+ }
+ // if (that.dataList.length === 0) {
+ // this.messageText = "璇锋坊鍔犲晢鍝佸垪琛�"
+ // this.messageToggle('error')
+ // return;
+ // }
+ // for (var i = 0; i < that.dataList.length; i++) {
+ // if (that.dataList[i].anfme == 0 || that.dataList[i].anfme == '') {
+ // this.messageText = that.dataList[i].matnr + '涓婃灦鏁伴噺涓嶈兘涓�0'
+ // this.messageToggle('error')
+ // return;
+ // }
+ // }
+ uni.request({
+ url: that.baseUrl + '/mobile/node/puttway',
+ data: JSON.stringify({
+ locNo: that.locNo,
+ zpallet: that.barcode
+ }),
+ method: 'POST',
+ header: {
+ 'token': uni.getStorageSync('token')
+ },
+ success(result) {
+ var res = result.data
+ if (res.code === 200) {
+ that.resst();
+ that.messageText = "涓婃灦鎴愬姛"
+ that.messageToggle('success')
+ } else if (res.code == 403) {
+ that.messageText = res.msg
+ that.messageToggle('error')
+ setTimeout(() => {
+ uni.reLaunch({
+ url: '../login/login'
+ });
+ }, 1000);
+ } else {
+ that.messageText = res.msg
+ that.messageToggle('error')
+ }
+ }
+ });
+ },
+ reset(type) {
+ this.msgType = type
+ this.title = '璀﹀憡'
+ this.content = '鏄惁閲嶇疆!'
+ this.$refs.resetConfirm.open()
+ },
+ // 纭閲嶇疆
+ resetConfirm() {
+ this.dataList = []
+ this.order = ''
+ this.barcode = ''
+ 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.recommendLocs = []
+ this.barcodeFocuss()
+ },
+ combClose() {
+ this.$refs.combConfirm.close()
+ },
+ // 鍙栨秷绉婚櫎
+ removeClose() {
+ this.$refs.alertDialog.close()
+ },
+ }
+ }
+</script>
+
+<style>
+ @import url('../../../static/css/wms.css/wms.css');
+ .popup-content {
+ /* height: 90vh; */
+ height: 90vh;
+ width: 200px;
+ }
+ .recommend {
+ width: 300rpx;
+ height: 100rpx;
+ text-align: center;
+ line-height: 100rpx;
+ }
+ .list {
+ display: flex;
+ min-height: 80rpx;
+ background-color: #FFF;
+ margin: auto 20rpx;
+ border-radius: 20rpx;
+ box-shadow: 0px 0px 30px 0px rgba(0,0,0,0.2);
+ }
+ .list:first-child {
+ margin-top: 410rpx;
+ }
+ .list:last-child {
+ margin-bottom: 120rpx;
+ }
+ .code {
+ width: 100%;
+ position: fixed;
+ min-height: 200rpx;
+ background-color: #FFF;
+ z-index: 10;
+ }
+ .item {
+ display: flex;
+ align-items: center;
+ height: 100rpx;
+ margin-left: 20rpx;
+ border-bottom: 1px solid #DCDFE6;
+ }
+
+ .item input {
+ height: 50rpx;
+ line-height: 50rpx;
+ /* font-family: PingFang SC; uniapp 榛樿瀛椾綋涓嶅眳涓� */
+ font-size: 36upx;
+ font-family: PingFang SC;
+ width: 55vw;
+
+ }
+
+ .code-decs {
+ width: 20vw;
+ font-size: 18px;
+ color: #303133;
+ }
+
+ .item-right {
+ margin-left: auto;
+ margin-right: 20rpx;
+ }
+
+ .mat-list-title {
+ height: 80rpx;
+ line-height: 80rpx;
+ width: 100%;
+ background-color: white;
+ position: fixed;
+ 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
diff --git a/pages/tzsk/pakin/pakin.vue b/pages/tzsk/pakin/pakin.vue
new file mode 100644
index 0000000..6ee913b
--- /dev/null
+++ b/pages/tzsk/pakin/pakin.vue
@@ -0,0 +1,583 @@
+<template>
+ <view>
+ <view class="code">
+ <view class="item">
+ <view class="code-decs">璁㈠崟鍙�:</view>
+ <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="orderNo" :focus="orderNoFocus"
+ @input="findOrder()">
+ </view>
+ <view class="item">
+ <view class="code-decs">鎵樼洏鐮�:</view>
+ <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus"
+ @input="barcodeInput()">
+ </view>
+ <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>
+ <view class="mat-list-title">
+ 鍟嗗搧鍒楄〃
+ </view>
+ <scroll-view>
+ <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="left-item">
+ <input type="text" v-model="item.containerCode">
+ <!-- <uni-tag :text="item.containerCode" type="primary"></uni-tag> -->
+ </view>
+ </view>
+ <view class="list-left-item">
+ <view class="desc">閿�鍞崟鍙凤細</view>
+ <view class="left-item">
+ <input type="text" v-model="item.csocode">
+ <!-- <uni-tag :text="item.containerCode" type="primary"></uni-tag> -->
+ </view>
+ </view>
+ <view class="list-left-item">
+ <view class="desc">璁㈠崟琛屽彿锛�</view>
+ <view class="left-item">
+ <input type="text" v-model="item.isoseq">
+ <!-- <uni-tag :text="item.containerCode" type="primary"></uni-tag> -->
+ </view>
+ </view>
+ <view class="list-left-item">
+ <view class="desc">缂栫爜锛�</view>
+ <view class="left-item">
+ <uni-tag :text="item.matnr" type="primary"></uni-tag>
+ </view>
+ </view>
+ <view class="list-left-item">
+ <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.specs}}</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="left-item">{{item.anfme}}</view>
+ </view>
+ </view>
+ <view class="list-right">
+ <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>
+ </view>
+ </scroll-view>
+ <!-- 搴曢儴鎿嶄綔鎸夐挳 -->
+ <view class="buttom">
+ <button size="mini" @click="reset('warn')">閲嶇疆</button>
+ <button size="mini" type="primary" @click="combConfirm('warn')">缁勬墭</button>
+ </view>
+ <!-- 寮圭獥 -->
+ <!-- 淇敼鏁伴噺 -->
+ <view>
+ <uni-popup ref="revise" type="dialog">
+ <view class="popup">
+ <!-- 鏍囬 -->
+ <view class="title">淇敼</view>
+ <view class="popup-item">
+ <view class="popup-item-left">缂栫爜:</view>
+ <view class="popup-item-right">
+ <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> -->
+ <!-- <view class="popup-item">
+ <view class="popup-item-left">閲嶉噺:</view>
+ <view class="popup-item-right"><input type="text" v-model="weight"></view>
+ </view> -->
+ <view class="popup-item">
+ <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>
+ </view>
+ <view class="btn">
+ <view class="btn-left" @click="reviseClose">鍙栨秷</view>
+ <view class="btn-right" @click="reviseConfirm()">淇敼</view>
+ </view>
+ </view>
+ </uni-popup>
+ </view>
+ <!-- 绉婚櫎纭 -->
+ <view>
+ <!-- 鎻愮ず绐楃ず渚� -->
+ <uni-popup ref="alertDialog" type="dialog">
+ <uni-popup-dialog :type="msgType" confirmText="绉婚櫎" :title="title" :content="content"
+ @confirm="removeConfirm()" @close="removeClose"></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>
+ <uni-popup ref="combConfirm" type="dialog">
+ <uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
+ @confirm="comb" @close="combClose"></uni-popup-dialog>
+ </uni-popup>
+ </view>
+ <!-- 纭閲嶇疆 -->
+ <view>
+ <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>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+ baseUrl: '',
+ token: '',
+ barcode: '',
+ orderNo: '',
+
+ dataList: [],
+ count: 0,
+ rowNum: '',
+ matnr: '',
+ batch: '',
+ weight: '',
+ msgType1: 'success',
+ msgType: 'success',
+ messageText: '',
+ title: '',
+ content: '',
+ barcodeFocus: false,
+ orderNoFocus: true,
+ matFocus: false,
+ matData: '',
+ removeNum: 0,
+ tempOrderInfo: {csocode: '',isoseq: ''}
+ }
+ },
+ onLoad() {
+
+ },
+ onShow() {
+ this.baseUrl = uni.getStorageSync('baseUrl');
+ this.token = uni.getStorageSync('token');
+ },
+ methods: {
+ // 鏍规嵁璁㈠崟鍙疯繑鍥炲晢鍝佽鎯�
+ findOrder() {
+ let that = this
+ that.tempOrderInfo.csocode = ''
+ that.tempOrderInfo.isoseq = ''
+ uni.request({
+ url: that.baseUrl + '/mobile/order/search/orderNo/auth',
+ header: {'token': uni.getStorageSync('token')},
+ data: {
+ orderNo: that.orderNo
+ },
+ success(res) {
+ res = res.data
+ if (res.code === 200) {
+ if(res.data && res.data[0].combMats) {
+ for (let i = 0; i < res.data[0].combMats.length; i++) {
+ that.checkMat(res.data[0].combMats[i])
+ }
+ // that.tempOrderInfo.csocode = res.data[0].combMats.csocode ? res.data[0].combMats.csocode : ''
+ // that.tempOrderInfo.isoseq = res.data[0].combMats.isoseq ? res.data[0].combMats.isoseq : ''
+ } else {
+ uni.showToast({
+ title: that.orderNo + '璇锋鏌ヨ鍗曞彿鏄惁姝ｇ‘',
+ icon: "none",
+ position: 'top'
+ })
+ }
+ } 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'
+ })
+ }
+ }
+ })
+ },
+ messageToggle(type) {
+ this.msgType1 = type
+ this.$refs.message.open()
+ },
+ // barcode input 浜嬩欢
+ barcodeInput() {
+ // 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
+ setTimeout(() => {
+ var len = this.barcode.length
+ if (len != 8) {
+ uni.showToast({
+ title: '鎵樼洏鐮佹湁璇閲嶈瘯',
+ icon: "none",
+ position: 'top'
+ });
+ this.barcodeFocuss()
+ return;
+ }
+ this.focuss()
+ }, 200)
+ },
+ // 鎵樼洏鐮佹湁璇噸缃�
+ barcodeFocuss() {
+ let that = this;
+ that.barcodeFocus = false;
+ setTimeout(() => {
+ that.barcode = '';
+ that.barcodeFocus = true;
+ }, 100);
+ },
+ // 鍟嗗搧鍏夋爣娓呯┖閲嶇疆
+ focuss() {
+ this.focus = false;
+ setTimeout(() => {
+ this.matnr = '';
+ this.matFocus = true;
+ }, 100);
+ },
+ // 鎼滅储鐗╂枡
+ findMat() {
+ let that = this
+ 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)
+ that.focuss()
+ },
+ },
+ });
+ } 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
+ for (var i = 0; i < len; i++) {
+ 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)
+ }
+ },
+ // 淇敼鎵瑰彿
+ revise(item, i) {
+ this.matnr = 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() {
+ this.messageText = "绉婚櫎鎴愬姛"
+ this.messageToggle('success')
+ this.dataList.splice(this.removeNum, 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].weight = this.weight
+ this.matnr = ''
+ 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.$refs.combConfirm.open()
+ },
+ combClose() {
+ this.$refs.combConfirm.close()
+ },
+ comb() {
+ uni.vibrateShort();
+ let that = this;
+ if (that.barcode === '') {
+ this.messageText = "璇锋壂鎻忔墭鐩樻潯鐮�"
+ this.messageToggle('error')
+ return;
+ }
+ if (that.dataList.length === 0) {
+ this.messageText = "璇锋坊鍔犲晢鍝佸垪琛�"
+ this.messageToggle('error')
+ return;
+ }
+ for (var i = 0; i < that.dataList.length; i++) {
+ if (that.dataList[i].anfme == 0 || that.dataList[i].anfme == '') {
+ this.messageText = that.dataList[i].matnr + '缁勬墭鏁伴噺涓嶈兘涓�0'
+ this.messageToggle('error')
+ return;
+ }
+ }
+ uni.request({
+ url: that.baseUrl + '/mobile/comb/auth',
+ data: JSON.stringify({
+ barcode: that.barcode,
+ combMats: that.dataList
+ }),
+ method: 'POST',
+ header: {
+ 'token': uni.getStorageSync('token')
+ },
+ success(result) {
+ var res = result.data
+ if (res.code === 200) {
+ that.resst();
+ that.messageText = "缁勬墭鎴愬姛"
+ that.messageToggle('success')
+ const innerAudioContext = uni.createInnerAudioContext();
+ innerAudioContext.src = '/static/music/pakinOk.mp3';
+ innerAudioContext.play()
+ } else if (res.code == 403) {
+ that.messageText = res.msg
+ that.messageToggle('error')
+ setTimeout(() => {
+ uni.reLaunch({
+ url: '../login/login'
+ });
+ }, 1000);
+ } else {
+ that.messageText = res.msg
+ that.messageToggle('error')
+ }
+ }
+ });
+ },
+ 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.orderNo = ''
+ this.barcodeFocuss()
+ },
+ }
+ }
+</script>
+
+<style>
+ @import url('../../../static/css/wms.css/wms.css');
+
+ .code {
+ width: 100%;
+ position: fixed;
+ min-height: 210rpx;
+ background-color: #FFF;
+ z-index: 10;
+ }
+
+ .item {
+ display: flex;
+ align-items: center;
+ height: 70rpx;
+ margin-left: 20rpx;
+ border-bottom: 1px solid #DCDFE6;
+ }
+
+ .item input {
+ height: 50rpx;
+ line-height: 50rpx;
+ /* font-family: PingFang SC; uniapp 榛樿瀛椾綋涓嶅眳涓� */
+ font-size: 36upx;
+ font-family: PingFang SC;
+ width: 55vw;
+
+ }
+
+ .code-decs {
+ width: 20vw;
+ font-size: 18px;
+ color: #303133;
+ }
+
+ .item-right {
+ margin-left: auto;
+ margin-right: 20rpx;
+ }
+
+ .mat-list-title {
+ height: 80rpx;
+ line-height: 80rpx;
+ width: 100%;
+ background-color: white;
+ position: fixed;
+ margin-top: 200rpx;
+ z-index: 9;
+ /* border-top: 1px solid #DCDFE6; */
+ text-align: center;
+ box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.2);
+ }
+</style>
diff --git a/static/css/wms.css/wms.css b/static/css/wms.css/wms.css
index 34210d6..075d6b1 100644
--- a/static/css/wms.css/wms.css
+++ b/static/css/wms.css/wms.css
@@ -36,6 +36,9 @@
margin: 1px 1px 1px 1px;
/* color: #409EFF; */
}
+.left-item input {
+ border-bottom: 1px solid #cecece;
+}
.list-right {
display: flex;
width: 20vw;
--
Gitblit v1.9.1