From 8af4b014816bea0d7ff1f4c2bc3a5c222a9f5aa2 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期一, 08 十二月 2025 08:52:17 +0800
Subject: [PATCH] Merge branch 'jsxswms-app' of http://47.97.1.152:5880/r/wms_app into jsxswms-app
---
pages/AGV/CallEmptyCar.vue | 405 +++++++++++++
pages/AGV/CollectionPakin.vue | 529 ++++++++++++++++++
pages/mat/matSelected.vue | 50 +
pages/check/checkMatSelected.vue | 121 ++++
pages/check/check.vue | 89 ++
pages/AGV/CollectionInCall.vue | 381 +++++++++++++
pages.json | 126 ++-
pages/pakin/pakin.vue | 26
8 files changed, 1,639 insertions(+), 88 deletions(-)
diff --git a/pages.json b/pages.json
index cef199b..157f0ea 100644
--- a/pages.json
+++ b/pages.json
@@ -37,6 +37,18 @@
}
},
{
+ "path": "pages/AGV/CollectionPakin",
+ "style": {
+ "navigationBarTitleText": "闆嗚揣鍖虹粍鎵�"
+ }
+ },
+ {
+ "path": "pages/AGV/CollectionInCall",
+ "style": {
+ "navigationBarTitleText": "闆嗚揣鍖哄叆搴�"
+ }
+ },
+ {
"path": "pages/AGV/CachePakin",
"style": {
"navigationBarTitleText": "缂撳瓨鍖虹粍鎵�"
@@ -58,6 +70,12 @@
"path": "pages/AGV/AGVStart",
"style": {
"navigationBarTitleText": "AGV鍚姩鍏ュ簱"
+ }
+ },
+ {
+ "path": "pages/AGV/CallEmptyCar",
+ "style": {
+ "navigationBarTitleText": "鍏ュ簱鍖哄懠鍙┖杞�"
}
},
{
@@ -222,14 +240,14 @@
"navigationBarTitleText": "鎹㈡澘缁戝畾"
}
},
-
+
{
"path": "pages/print/qr",
"style": {
"navigationBarTitleText": "浜岀淮鐮�"
}
},
-
+
{
"path": "pages/mat/matList",
"style": {
@@ -249,22 +267,19 @@
}
},
{
- "path" : "pages/order/orderPakin2",
- "style" :
- {
- "navigationBarTitleText" : "璁㈠崟缁勬墭",
- "enablePullDownRefresh" : false
+ "path": "pages/order/orderPakin2",
+ "style": {
+ "navigationBarTitleText": "璁㈠崟缁勬墭",
+ "enablePullDownRefresh": false
}
- }
- ,{
- "path" : "pages/order/orderList",
- "style" :
- {
- "navigationBarTitleText": "鍗曟嵁鍒楄〃",
- "enablePullDownRefresh": false
- }
-
- },
+ }, {
+ "path": "pages/order/orderList",
+ "style": {
+ "navigationBarTitleText": "鍗曟嵁鍒楄〃",
+ "enablePullDownRefresh": false
+ }
+
+ },
{
"path": "pages/order/orderDetlList",
"style": {
@@ -272,51 +287,54 @@
}
},
{
- "path" : "pages/AGV/AGVSiteList",
- "style" :
- {
- "navigationBarTitleText": "浜х嚎鍙枡",
- "enablePullDownRefresh": false
- }
-
+ "path": "pages/AGV/AGVSiteList",
+ "style": {
+ "navigationBarTitleText": "浜х嚎鍙枡",
+ "enablePullDownRefresh": false
+ }
+
},
{
- "path" : "pages/AGV/AGVLineCall",
- "style" :
- {
- "navigationBarTitleText": "浜х嚎鍙枡",
- "enablePullDownRefresh": false
- }
-
+ "path": "pages/AGV/AGVLineCall",
+ "style": {
+ "navigationBarTitleText": "浜х嚎鍙枡",
+ "enablePullDownRefresh": false
+ }
+
},
{
- "path" : "pages/AGV/AGVFinishedCall",
- "style" :
- {
- "navigationBarTitleText": "鎴愬搧鍛煎彨",
- "enablePullDownRefresh": false
- }
-
+ "path": "pages/AGV/AGVFinishedCall",
+ "style": {
+ "navigationBarTitleText": "鎴愬搧鍛煎彨",
+ "enablePullDownRefresh": false
+ }
+
},
{
- "path" : "pages/AGV/AGVStaBind",
- "style" :
- {
- "navigationBarTitleText": "AGV绔欑粦瀹�",
- "enablePullDownRefresh": false
- }
-
+ "path": "pages/AGV/AGVStaBind",
+ "style": {
+ "navigationBarTitleText": "AGV绔欑粦瀹�",
+ "enablePullDownRefresh": false
+ }
+
},
{
- "path" : "pages/check/check",
- "style" :
- {
- "navigationBarTitleText": "鐩樼偣",
- "enablePullDownRefresh": false
- }
-
+ "path": "pages/check/check",
+ "style": {
+ "navigationBarTitleText": "鐩樼偣",
+ "enablePullDownRefresh": false
+ }
+
+ },
+ {
+ "path": "pages/check/checkMatSelected",
+ "style": {
+ "navigationBarTitleText": "娣诲姞鍟嗗搧",
+ "enablePullDownRefresh": false
+ }
+
}
- ],
+ ],
"globalStyle": {
"navigationBarTextStyle": "black",
"navigationBarTitleText": "uni-app",
@@ -324,4 +342,4 @@
"backgroundColor": "#F8F8F8"
},
"uniIdRouter": {}
-}
+}
\ No newline at end of file
diff --git a/pages/AGV/CallEmptyCar.vue b/pages/AGV/CallEmptyCar.vue
new file mode 100644
index 0000000..72ad6b3
--- /dev/null
+++ b/pages/AGV/CallEmptyCar.vue
@@ -0,0 +1,405 @@
+<template>
+ <view>
+ <view class="code">
+ <view class="item">
+ <view class="code-decs">鍏ュ簱鍖�:</view>
+ <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="tarSite" :focus="barcodeFocus">
+ </view>
+
+ </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="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: '',
+ orderNoFocus: false,
+ barcodeFocus: true,
+ matFocus: false,
+ matData: '',
+ removeNum: 0,
+ locNo: "",
+ orgSite: '',
+ tarSite: '',
+ staList: ["e"],
+ }
+ },
+ onLoad() {
+ let that = this
+ const eventChannel = this.getOpenerEventChannel();
+
+ eventChannel.on('data', function(data) {
+ console.log(data.data)
+ that.orgSite = data.data.agvSite.name
+ that.checkMat(data.data.wrkDetls)
+ });
+ },
+ onShow() {
+ this.baseUrl = uni.getStorageSync('baseUrl');
+ this.token = uni.getStorageSync('token');
+ },
+ mounted() {
+ this.tarSite = uni.getStorageSync('tarSite')
+ },
+ methods: {
+ messageToggle(type) {
+ this.msgType1 = type
+ this.$refs.message.open()
+ },
+ clearOrderNo() {
+ this.orderNo = ''
+ let that = this;
+ that.orderNoFocus = false;
+ setTimeout(() => {
+ that.orderNo = '';
+ that.orderNoFocus = true;
+ }, 100);
+ },
+ orderNoInput() {
+ // 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
+ setTimeout(() => {
+ var len = this.orderNo.length
+ this.barcodeFocuss()
+ }, 200)
+ },
+ // barcode input 浜嬩欢
+ barcodeInput() {
+ // 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
+ setTimeout(() => {
+ var len = this.barcode.length
+ 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
+ let m = that.matnr.split(";")
+ let matnr1 = m[0].slice(3)
+ for (var i = 0; i < that.dataList.length; i++) {
+ if (that.dataList[i].matnr === matnr1) {
+ that.dataList[i].review = "宸插鏍�"
+ }
+
+ }
+ setTimeout(() => {
+ this.matnr = '';
+ }, 100);
+ // uni.request({
+ // url: that.baseUrl + '/mat/auth',
+ // data: {
+ // matnr: matnr1
+ // },
+ // 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) {
+ this.dataList = 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.setStorageSync('tarSite', this.tarSite);
+ uni.vibrateShort();
+ let that = this;
+ if (that.tarSite === '') {
+ this.messageText = "鍏ュ簱鍖轰负绌�"
+ this.messageToggle('error')
+ return;
+ }
+ uni.request({
+ url: that.baseUrl + '/mobile/agv/callEmptyCar',
+ data: JSON.stringify({
+ orgSite: that.orgSite,
+ tarSite: that.tarSite
+ }),
+ 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.messageText = "閲嶇疆瀹屾垚"
+ this.messageToggle('success')
+ },
+ // 鍙栨秷閲嶇疆
+ resetClose() {
+
+ },
+ // 娓呯┖
+ resst() {
+ this.orgSite = ''
+ this.dataList = []
+
+
+ },
+ }
+ }
+</script>
+
+<style>
+ @import url('../../static/css/wms.css/wms.css');
+
+ .code {
+ width: 100%;
+ position: fixed;
+ min-height: 100rpx;
+ 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: 100rpx;
+ z-index: 9;
+ /* border-top: 1px solid #DCDFE6; */
+ text-align: center;
+ box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.2);
+ }
+</style>
\ No newline at end of file
diff --git a/pages/AGV/CollectionInCall.vue b/pages/AGV/CollectionInCall.vue
new file mode 100644
index 0000000..9bc264f
--- /dev/null
+++ b/pages/AGV/CollectionInCall.vue
@@ -0,0 +1,381 @@
+<template>
+ <view>
+ <view class="code">
+ <view class="item">
+ <view class="code-decs">鍏ュ簱绔�:</view>
+ <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="orgSite" :focus="barcodeFocus">
+ </view>
+ <view class="item">
+ <view class="code-decs">鎵樼洏鐮�:</view>
+ <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode">
+ </view>
+ </view>
+ <view class="mat-list-title">
+ </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="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: uni.getStorageSync('baseUrl'),
+ token: '',
+ barcode: '',
+ orderNo: '',
+ dataList: [],
+ count: 0,
+ rowNum: '',
+ matnr: '',
+ batch: '',
+ weight: '',
+ msgType1: 'success',
+ msgType: 'success',
+ messageText: '',
+ title: '',
+ content: '',
+ orderNoFocus: false,
+ barcodeFocus: true,
+ matFocus: false,
+ matData: '',
+ removeNum: 0,
+ locNo: "",
+ orgSite: '',
+ tarSite: '',
+ staList: [],
+ }
+ },
+ onLoad() {
+ let that = this
+ const eventChannel = this.getOpenerEventChannel();
+ that.getSites()
+ },
+ onShow() {
+ this.baseUrl = uni.getStorageSync('baseUrl');
+ this.token = uni.getStorageSync('token');
+ },
+ mounted() {
+ // this.tarSite = uni.getStorageSync('tarSite')
+ },
+ methods: {
+ messageToggle(type) {
+ this.msgType1 = type
+ this.$refs.message.open()
+ },
+ clearOrderNo() {
+ this.orderNo = ''
+ let that = this;
+ that.orderNoFocus = false;
+ setTimeout(() => {
+ that.orderNo = '';
+ that.orderNoFocus = true;
+ }, 100);
+ },
+ orderNoInput() {
+ // 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
+ setTimeout(() => {
+ var len = this.orderNo.length
+ this.barcodeFocuss()
+ }, 200)
+ },
+ // barcode input 浜嬩欢
+ barcodeInput() {
+ // 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
+ setTimeout(() => {
+ var len = this.barcode.length
+ 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);
+ },
+ // 鎼滅储鐗╂枡
+ getSites() {
+ let that = this
+ let staResults = [];
+ uni.request({
+ url: that.baseUrl + '/mobile/cache/locs',
+ header: {
+ 'token': uni.getStorageSync('token')
+ },
+ method: 'GET',
+ success(result) {
+ result = result.data
+ if (result.code === 200 && result.data) {
+ staResults.push(...result.data);
+ staResults.forEach(item => {
+ that.staList.push(item?.locNo)
+ })
+ } 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) {
+ this.dataList = 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.setStorageSync('tarSite', this.tarSite);
+ uni.vibrateShort();
+ let that = this;
+ if (that.orgSite === '') {
+ this.messageText = "浜х嚎绔欎负绌�"
+ this.messageToggle('error')
+ return;
+ }
+ uni.request({
+ url: that.baseUrl + '/mobile/collection/agv/call',
+ data: JSON.stringify({
+ orgSite: that.orgSite,
+ barcode: 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.messageText = "閲嶇疆瀹屾垚"
+ this.messageToggle('success')
+ },
+ // 鍙栨秷閲嶇疆
+ resetClose() {
+
+ },
+ // 娓呯┖
+ resst() {
+ this.orgSite = ''
+ this.dataList = []
+
+
+ },
+ }
+ }
+</script>
+
+<style>
+ @import url('../../static/css/wms.css/wms.css');
+
+ .code {
+ width: 100%;
+ position: fixed;
+ min-height: 100rpx;
+ 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: 100rpx;
+ z-index: 9;
+ /* border-top: 1px solid #DCDFE6; */
+ text-align: center;
+ box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.2);
+ }
+</style>
\ No newline at end of file
diff --git a/pages/AGV/CollectionPakin.vue b/pages/AGV/CollectionPakin.vue
new file mode 100644
index 0000000..b10ebfb
--- /dev/null
+++ b/pages/AGV/CollectionPakin.vue
@@ -0,0 +1,529 @@
+<template>
+ <view>
+ <view class="code">
+ <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 class="item">
+ <view class="code-decs">婊℃墭:</view>
+ <radio-group @change="isFrozen">
+ <label>
+ <radio :checked="ck1" style="margin-left: 10rpx;"/><text>鏄�</text>
+ </label>
+ <label>
+ <radio :checked="ck2" style="margin-left: 50rpx;"/><text>鍚�</text>
+ </label>
+ </radio-group>
+ </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.matnr" type="primary"></uni-tag>
+ </view>
+ </view>
+ <view class="list-left-item">
+ <view class="desc">鍝佸悕锛�</view>
+ <view class="left-item" style="word-break: break-all;">{{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.standby1" 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="standby1"></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: '',
+ dataList: [],
+ count: 0,
+ rowNum: '',
+ matnr: '',
+ batch: '',
+ weight: '',
+ msgType1: 'success',
+ msgType: 'success',
+ messageText: '',
+ title: '',
+ content: '',
+ barcodeFocus: true,
+ matFocus: false,
+ matData: '',
+ removeNum: 0,
+ ck1: true,
+ ck2: false,
+ isFull: true,
+ standby1: ''
+ }
+ },
+ onLoad() {
+
+ },
+ onShow() {
+ this.baseUrl = uni.getStorageSync('baseUrl');
+ this.token = uni.getStorageSync('token');
+ },
+ methods: {
+ isFrozen() {
+ this.isFull = !this.isFull
+ console.log(this.isFull);
+ },
+ messageToggle(type) {
+ this.msgType1 = type
+ this.$refs.message.open()
+ },
+ // barcode input 浜嬩欢
+ barcodeInput() {
+ // 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
+ setTimeout(() => {
+ var len = this.barcode.length
+ if (len >= 9 && 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.standby1 = this.dataList[i].standby1
+ 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].standby1 = this.standby1
+ 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.messageText = "閲嶇疆瀹屾垚"
+ this.messageToggle('success')
+ },
+ // 鍙栨秷閲嶇疆
+ resetClose() {
+
+ },
+ // 娓呯┖
+ resst() {
+ this.dataList = []
+ this.barcode = ''
+ this.barcodeFocuss()
+ },
+ }
+ }
+</script>
+
+<style>
+ @import url('../../static/css/wms.css/wms.css');
+
+ .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);
+ }
+
+ .list:first-child {
+ margin-top: 300rpx;
+ }
+</style>
\ No newline at end of file
diff --git a/pages/check/check.vue b/pages/check/check.vue
index 2cd67a2..4b4f95f 100644
--- a/pages/check/check.vue
+++ b/pages/check/check.vue
@@ -8,7 +8,9 @@
</view>
</view>
<view class="mat-list-title">
- 鍟嗗搧鍒楄〃
+ <view style="width: 200rpx;"></view>
+ <view style="-webkit-flex: 1;flex: 1;">鍟嗗搧鍒楄〃</view>
+ <view style="width: 200rpx; display: flex; justify-content: center; align-items: center;"><button size="mini" type="primary" @click="openAddDialog">娣诲姞</button></view>
</view>
<scroll-view>
<view class="list" v-for="(item,i) in dataList" :key="i">
@@ -31,8 +33,8 @@
</view>
<view class="list-left-item">
- <view class="desc">瑙勬牸锛�</view>
- <view class="left-item">{{item.specs}}</view>
+ <view class="desc">渚涘簲鍟嗭細</view>
+ <view class="left-item">{{item.suppCode}}</view>
</view>
<view class="list-left-item">
<view class="desc">鎵瑰彿锛�</view>
@@ -121,6 +123,24 @@
@confirm="resetConfirm" @close="resetClose"></uni-popup-dialog>
</uni-popup>
</view>
+ <!-- 娣诲姞鍟嗗搧寮圭獥 -->
+ <view>
+ <uni-popup ref="addDialog" 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="addMatnr" placeholder="璇疯緭鍏ョ紪鐮�">
+ </view>
+ </view>
+ <view class="btn">
+ <view class="btn-left" @click="addClose">鍙栨秷</view>
+ <view class="btn-right" @click="addConfirm">鎻愪氦</view>
+ </view>
+ </view>
+ </uni-popup>
+ </view>
</view>
</template>
@@ -144,7 +164,8 @@
barcodeFocus: true,
matFocus: false,
matData: '',
- pushDisabled:false
+ pushDisabled:false,
+ addMatnr: ''
}
},
@@ -326,6 +347,64 @@
})
},
+ // 鎵撳紑娣诲姞寮圭獥
+ openAddDialog() {
+ this.addMatnr = ''
+ this.$refs.addDialog.open()
+ },
+ // 鍙栨秷娣诲姞
+ addClose() {
+ this.$refs.addDialog.close()
+ },
+ // 纭娣诲姞
+ addConfirm() {
+ if (!this.addMatnr) {
+ this.messageText = "璇疯緭鍏ョ紪鐮�"
+ this.messageToggle('error')
+ return
+ }
+ let that = this
+ uni.request({
+ url: that.baseUrl + '/mat/auth?matnr=' + encodeURIComponent(that.addMatnr),
+ header: {
+ 'token': uni.getStorageSync('token')
+ },
+ method: 'GET',
+ success(res) {
+ res = res.data
+ if (res.code === 200) {
+ if (!res.data) {
+ that.messageText = "鏈壘鍒拌鍟嗗搧"
+ that.messageToggle('error')
+ return
+ }
+ that.$refs.addDialog.close()
+ uni.navigateTo({
+ url: './checkMatSelected',
+ success: function(result) {
+ result.eventChannel.emit('mat', {data: res.data})
+ },
+ events: {
+ checkMatList: function(data) {
+ that.dataList.push(data.data)
+ }
+ }
+ })
+ } 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')
+ }
+ }
+ })
+ }
}
}
</script>
@@ -374,6 +453,8 @@
}
.mat-list-title {
+ display: flex;
+ align-items: center;
height: 80rpx;
line-height: 80rpx;
width: 100%;
diff --git a/pages/check/checkMatSelected.vue b/pages/check/checkMatSelected.vue
new file mode 100644
index 0000000..1635b41
--- /dev/null
+++ b/pages/check/checkMatSelected.vue
@@ -0,0 +1,121 @@
+<template>
+ <view>
+ <view class="form" v-if="mat">
+ <view class="form-item">
+ <view class="form-item-desc"><text>鍟嗗搧缂栫爜</text></view>
+ <view class="form-item-content"><text>{{mat.matnr}}</text></view>
+ </view>
+ <view class="form-item">
+ <view class="form-item-desc"><text>鍟嗗搧鍚嶇О</text></view>
+ <view class="form-item-content" style="word-break: break-all;line-height: 1.5;"><text>{{mat.maktx}}</text></view>
+ </view>
+ <view class="form-item">
+ <view class="form-item-desc"><text>瑙勬牸</text></view>
+ <view class="form-item-content"><text>{{mat.specs}}</text></view>
+ </view>
+ <view class="form-item">
+ <view class="form-item-desc"><text>鎵瑰彿</text></view>
+ <view class="form-item-content">
+ <view class="form-input">
+ <input type="text" v-model="mat.batch">
+ </view>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="form-item-desc"><text>渚涘簲鍟嗙紪鐮�</text></view>
+ <view class="form-item-content">
+ <view class="form-input">
+ <input type="text" v-model="mat.suppCode">
+ </view>
+ </view>
+ </view>
+ </view>
+ <!-- 搴曢儴鎿嶄綔鎸夐挳 -->
+ <view class="buttom">
+ <button size="mini" type="primary" @click="back()">纭</button>
+ </view>
+ </view>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+ mat: null,
+ selectNum: null
+ }
+ },
+ onLoad(option) {
+ let that = this
+ // #ifdef APP-NVUE
+ const eventChannel = this.$scope.eventChannel;
+ // #endif
+ // #ifndef APP-NVUE
+ const eventChannel = this.getOpenerEventChannel();
+ // #endif
+
+ eventChannel.on('mat', function(data) {
+ // 鎺ュ彛杩斿洖鍗曚釜瀵硅薄锛屽垵濮嬪寲anfme鍜宐atch
+ let matData = data.data
+ if (!matData.anfme) matData.anfme = 0
+ if (!matData.workQty) matData.workQty = 0
+ if (!matData.batch) matData.batch = ''
+ matData.id = null
+ that.mat = matData
+ })
+ },
+ methods: {
+ changeValue(value) {
+ this.mat.anfme = value
+ this.selectNum = value
+ },
+ back() {
+ if (this.selectNum != null) {
+ this.mat.anfme = this.selectNum
+ }
+ this.getOpenerEventChannel().emit('checkMatList', {data: this.mat});
+ uni.navigateBack()
+ }
+ }
+ }
+</script>
+
+<style>
+ @import url('../../static/css/wms.css/wms.css');
+ .form {
+ min-height: 80rpx;
+ background-color: #FFF;
+ margin-top: 10px;
+ color: #606266;
+ box-shadow: 0px 0px 50px 0px rgba(0,0,0,0.2);
+ }
+ .form-item {
+ min-height: 100rpx;
+ line-height: 1;
+ border-bottom: 1px solid #DCDFE6;
+ margin-left: 40rpx;
+ display: flex;
+ align-items: center;
+ }
+ .form-item-desc {
+ width: 30%;
+ }
+ .form-item-content {
+ width: 60%;
+ }
+ .form-item:last-child {
+ border: none;
+ }
+ .form-input {
+ display: flex;
+ align-items: center;
+ width: 50vw;
+ height: 50rpx;
+ padding: 2px 5px;
+ border-bottom: 1px solid #E4E7ED;
+ border-radius: 5rpx;
+ }
+ .form-input input {
+ color: #606266;
+ }
+</style>
diff --git a/pages/mat/matSelected.vue b/pages/mat/matSelected.vue
index 55b5ff5..823e43d 100644
--- a/pages/mat/matSelected.vue
+++ b/pages/mat/matSelected.vue
@@ -1,27 +1,29 @@
<template>
<view>
<view class="form" v-for="mat in mats">
- <view class="form-item">
+ <!-- <view class="form-item">
<view class="form-item-desc"><text>璁㈠崟鍙�</text></view>
<view class="form-item-content"><text>{{mat.orderNo}}</text></view>
- </view>
+ </view> -->
<view class="form-item">
<view class="form-item-desc"><text>鍟嗗搧缂栫爜</text></view>
<view class="form-item-content"><text>{{mat.matnr}}</text></view>
</view>
<view class="form-item">
<view class="form-item-desc"><text>鍟嗗搧鍚嶇О</text></view>
- <view class="form-item-content" style="word-break: break-all;line-height: 1.5;"><text>{{mat.maktx}}</text></view>
+ <view class="form-item-content" style="word-break: break-all;line-height: 1.5;">
+ <text>{{mat.maktx}}</text>
+ </view>
</view>
<view class="form-item">
<view class="form-item-desc"><text>瑙勬牸</text></view>
<view class="form-item-content"><text>{{mat.specs}}</text></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">
<view class="form-input">
- <input type="text" v-model="mat.batch">
+ <input type="text" v-model="mat.standby1">
</view>
</view>
</view>
@@ -52,8 +54,8 @@
},
selectNum: null,
mats: null,
- baseIP:'',
- basePORT:'',
+ baseIP: '',
+ basePORT: '',
}
},
onLoad(option) {
@@ -64,20 +66,20 @@
// #ifndef APP-NVUE
const eventChannel = this.getOpenerEventChannel();
// #endif
-
+
// 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
eventChannel.on('mat', function(data) {
that.mats = data.data
})
-
-
+
+
},
methods: {
blur() {
-
+
},
focus() {
-
+
},
changeValue(value) {
this.mats[0].anfme = value
@@ -85,7 +87,11 @@
},
back() {
if (this.mats[0].anfme === 0) {
- uni.showToast({title: '璇疯緭鍏ユ暟閲�', icon: "none", position: 'top'});
+ uni.showToast({
+ title: '璇疯緭鍏ユ暟閲�',
+ icon: "none",
+ position: 'top'
+ });
return;
}
console.log("=======>");
@@ -95,9 +101,11 @@
} else {
this.mats[0].anfme = this.mats[0].enableQty
}
- this.getOpenerEventChannel().emit('matList', {data: this.mats[0]});
+ this.getOpenerEventChannel().emit('matList', {
+ data: this.mats[0]
+ });
uni.navigateBack({
-
+
})
}
}
@@ -106,13 +114,15 @@
<style>
@import url('../../static/css/wms.css/wms.css');
+
.form {
min-height: 80rpx;
background-color: #FFF;
margin-top: 10px;
color: #606266;
- box-shadow: 0px 0px 50px 0px rgba(0,0,0,0.2) ;
+ box-shadow: 0px 0px 50px 0px rgba(0, 0, 0, 0.2);
}
+
.form-item {
min-height: 100rpx;
line-height: 1;
@@ -121,16 +131,19 @@
display: flex;
align-items: center;
}
+
.form-item-desc {
width: 30%;
}
+
.form-item-content {
width: 60%;
}
-
+
.form-item:last-child {
border: none;
}
+
.form-input {
display: flex;
align-items: center;
@@ -140,7 +153,8 @@
border-bottom: 1px solid #E4E7ED;
border-radius: 5rpx;
}
- .form-input input{
+
+ .form-input input {
color: #606266;
}
</style>
\ No newline at end of file
diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index 5173e24..94474d3 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -104,7 +104,8 @@
<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" />
+ <uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474"
+ @change="changeValue" />
</view>
</view>
<view class="btn">
@@ -193,7 +194,7 @@
// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
setTimeout(() => {
var len = this.barcode.length
- if (len >= 9 && len <=8) {
+ if (len >= 9 && len <= 8) {
uni.showToast({
title: '鎵樼洏鐮佹湁璇閲嶈瘯',
icon: "none",
@@ -224,13 +225,12 @@
},
// 鎼滅储鐗╂枡
findMat() {
- let that = this
- let m = that.matnr.split(";")
- let matnr1 = m[0].slice(3)
+ let that = this
+
uni.request({
url: that.baseUrl + '/mat/auth',
data: {
- matnr: matnr1
+ matnr: that.matnr
},
header: {
'token': uni.getStorageSync('token')
@@ -246,7 +246,7 @@
// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
success: function(res) {
res.eventChannel.emit('mat', {
- data: result.data
+ data: [result.data]
})
},
// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
@@ -304,7 +304,8 @@
},
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) {
for (var j = 0; j < len; j++) {
@@ -320,7 +321,7 @@
} else {
add = true
}
-
+
} else {
// 鐩稿悓鐗╂枡鐩稿悓鎵瑰彿 鏁伴噺绱姞
this.dataList[i].anfme += mat.anfme
@@ -348,7 +349,7 @@
},
// 鍒楄〃绉婚櫎鎸夐挳
remove(item, i, type) {
- this.removeNum = i
+ this.removeNum = i
this.msgType = type
this.title = '璀﹀憡'
this.content = '鏄惁绉婚櫎褰撳墠鍟嗗搧!'
@@ -411,7 +412,7 @@
uni.request({
url: that.baseUrl + '/mobile/comb/auth',
data: JSON.stringify({
- barcode: that.barcode,
+ barcode: that.barcode,
combMats: that.dataList
}),
method: 'POST',
@@ -520,7 +521,8 @@
text-align: center;
box-shadow: 0px 0px 30px 0px rgba(0, 0, 0, 0.5);
}
+
.list:first-child {
margin-top: 250rpx;
}
-</style>
+</style>
\ No newline at end of file
--
Gitblit v1.9.1