From f62410d5ff3124f13612235eea6583088fadffcf Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 30 十月 2024 15:51:07 +0800
Subject: [PATCH] #
---
pages/pakin/leftovers.vue | 122 +++++++--
pages/home/home.vue | 18
pages/order/orderList.vue | 215 ++++++++++++++++
pages/order/orderPakin2.vue | 29 +
pages.json | 17 +
pages/AGV/AGVStart.vue | 12
pages/order/orderDetlList.vue | 94 +++++++
pages/pakin/pakin.vue | 10
pages/order/orderDetlList2.vue | 219 ++++++++++++++++
9 files changed, 672 insertions(+), 64 deletions(-)
diff --git a/pages.json b/pages.json
index bd43719..97b75bc 100644
--- a/pages.json
+++ b/pages.json
@@ -190,7 +190,22 @@
"enablePullDownRefresh" : false
}
}
- ],
+ ,{
+ "path" : "pages/order/orderList",
+ "style" :
+ {
+ "navigationBarTitleText": "鍗曟嵁鍒楄〃",
+ "enablePullDownRefresh": false
+ }
+
+ },
+ {
+ "path": "pages/order/orderDetlList",
+ "style": {
+ "navigationBarTitleText": "鍗曟嵁鏄庣粏鍒楄〃"
+ }
+ }
+ ],
"globalStyle": {
"navigationBarTextStyle": "black",
"navigationBarTitleText": "uni-app",
diff --git a/pages/AGV/AGVStart.vue b/pages/AGV/AGVStart.vue
index 7010001..7a699bc 100644
--- a/pages/AGV/AGVStart.vue
+++ b/pages/AGV/AGVStart.vue
@@ -1,10 +1,6 @@
<template>
<view>
- <view class="code">
- <view class="item">
- <view class="code-decs">妤煎彿:</view>
- <uni-combox :candidates="floorList" placeholder="璇烽�夋嫨妤煎彿" v-model="floor" @input="getFloor"></uni-combox>
- </view>
+ <view class="code">
<view class="item">
<view class="code-decs">鏆傚瓨浣�:</view>
<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="stationCode" :focus="stationCodeFocus"
@@ -12,9 +8,9 @@
</view>
</view>
- <view class="mat-list-title">
+ <!-- <view class="mat-list-title">
<view style="-webkit-flex: 1;flex: 1;">绔欑偣鍒楄〃</view>
- </view>
+ </view> -->
<scroll-view>
<view class="list" v-for="(item,i) in dataList" :key="i" :class="'bg-'+item.color">
<view class="aside">
@@ -557,7 +553,7 @@
width: 100%;
background-color: white;
position: fixed;
- margin-top: 200rpx;
+ margin-top: 100rpx;
z-index: 9;
/* border-top: 1px solid #DCDFE6; */
text-align: center;
diff --git a/pages/home/home.vue b/pages/home/home.vue
index ff170a4..ced8db4 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -37,20 +37,20 @@
color: 'orange',
cuIcon: 'pullup',
url: '/pakin/leftovers'
- },
- // {
- // title: '鍐嶆鎷ｆ枡',
- // name: 'changePallet',
- // color: 'green',
- // cuIcon: 'order',
- // url: '/pakin/pickAgain'
- // },
+ },
{
title: '璁㈠崟鍏ュ簱',
name: 'orderPakin',
color: 'red',
cuIcon: 'pullup',
- url: '/order/orderPakin2'
+ url: '/order/orderList'
+ },
+ {
+ title: '鍛煎彨Agv',
+ name: 'changePallet',
+ color: 'green',
+ cuIcon: 'order',
+ url: '/AGV/AGVStart'
},
// {
// title: '缁勬墭涓婃灦',
diff --git a/pages/order/orderDetlList.vue b/pages/order/orderDetlList.vue
new file mode 100644
index 0000000..ccc4a24
--- /dev/null
+++ b/pages/order/orderDetlList.vue
@@ -0,0 +1,94 @@
+<template>
+ <view>
+ <view class="card" v-for="item in menuList" @click="chose(item)">
+ <view class="tag-item">鍗曟嵁鍙凤細 {{item.orderNo}}</view>
+ <view class="tag-item">鐗╂枡鐮侊細 {{item.matnr}}</view>
+ <view class="tag-item">鐗╂枡鍚嶇О锛� {{item.maktx}}</view>
+ <view class="tag-item">瑙勬牸锛� {{item.specs}}</view>
+ <view class="tag-item">鎵规锛� {{item.batch}}</view>
+ <view class="tag-item">鏁伴噺锛� {{item.anfme}}</view>
+ <view class="tag-item">鍓╀綑鏁伴噺锛� {{item.enableQty}}</view>
+ </view>
+ </view>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+ data:'',
+ menuList: [],
+ order:'',
+ baseUrl: '',
+ token: '',
+ }
+ },
+ onLoad() {
+ let that = this
+ const eventChannel = this.getOpenerEventChannel();
+ eventChannel.on('data', function(data) {
+ that.order = data.data
+ that.getOrderNoList(that.order)
+ });
+ },
+ onShow() {
+ let that = this
+
+ },
+ methods: {
+ getOrderNoList(order) {
+ let that = this
+ uni.request({
+ url: uni.getStorageSync('baseUrl') + '/orderDetl/list/pda/auth',
+ method: 'POST',
+ data: {
+ orderNo: order.orderNo
+ },
+ success(res) {
+ res = res.data
+ that.menuList = res.data
+ }
+ })
+ },
+ chose(item) {
+ let that = this
+ uni.navigateTo({
+ url: "../order/orderPakin2",
+ success: function(res) {
+ // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
+ res.eventChannel.emit('orderItem', {
+ item: item
+ })
+ },
+ events: {
+ // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨�
+ acceptDataFromOpenedPage: function(data) {
+ // that.matnr = data.data
+ // that.input(that.matnr)
+ },
+ },
+
+
+ });
+ }
+ }
+ }
+</script>
+
+<style>
+ .card {
+ margin: 20rpx;
+ padding: 30rpx;
+ background-color: #157ec1;
+ border-radius: 20rpx;
+ color: #FFF;
+ }
+ .tag-item {
+ width: 100%;
+ min-height: 60rpx;
+ line-height: 2;
+ padding-left: 50rpx;
+ color: #ffffff;
+ font-size: 14px;
+ }
+</style>
diff --git a/pages/order/orderDetlList2.vue b/pages/order/orderDetlList2.vue
new file mode 100644
index 0000000..d41ca5f
--- /dev/null
+++ b/pages/order/orderDetlList2.vue
@@ -0,0 +1,219 @@
+<template>
+ <view>
+ <view class="card" v-for="item in menuList" @click="chose(item)">
+ {{item}}
+ </view>
+ </view>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+ tagList: [],
+ matList: [],
+ reload: false,
+ curr:1,
+ tag: '鍒嗙被',
+ baColor: "background-color: #0081ff;",
+ desc: '鍟嗗搧缂栧彿:',
+ baseUrl: '',
+ token: '',
+ status: 'more',
+ contentText: {
+ contentdown: '涓婃媺鍔犺浇鏇村',
+ contentrefresh: '鍔犺浇涓�',
+ contentnomore: '娌℃湁鏇村'
+ },
+ // 褰撳墠tagId
+ tagIdNow: 1,
+ menuList:[]
+ }
+ },
+ onReachBottom() {
+ this.status = 'more';
+ this.showMat(this.tagIdNow);
+ },
+ onLoad() {
+ let that = this
+ const eventChannel = this.getOpenerEventChannel();
+
+ // 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
+ eventChannel.on('commonUrl', function(data) {
+ that.commonUrl = data.commonUrl
+ })
+
+ eventChannel.on('data', function(data) {
+ that.order = data.data
+ that.getOrderNoList(that.order)
+ })
+ },
+ onShow() {
+ this.baseUrl = uni.getStorageSync('baseUrl');
+ this.token = uni.getStorageSync('token');
+ this.showMat(1)
+ },
+ methods: {
+ getOrderNoList(order) {
+ let that = this
+ uni.request({
+ url: that.baseUrl + '/orderDetl/list/pda/auth',
+ method: 'POST',
+ data: {
+ orderNo: order.orderNo
+ },
+ success(res) {
+ res = res.data
+ that.menuList = res.data
+ }
+ })
+ },
+ search() {
+ },
+ showTag(parentId) {
+ let that = this
+ uni.request({
+ url: that.baseUrl + '/tag/list/pda/auth',
+ header: {
+ 'token':uni.getStorageSync('token'),
+ },
+ data: {
+ limit: 100000,
+ parentId: parentId
+ },
+ header: {
+ 'token':uni.getStorageSync('token'),
+ },
+ success(result) {
+ that.tagList = null
+ that.matList = []
+ var res = result.data
+ if (res.code === 200) {
+ if (res.data != null && res.data.length > 0) {
+ that.tagList = res.data
+ } else {
+ that.showMat(parentId)
+ }
+ that.baColor = "background-color: #0081ff;"
+ } 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'})
+ }
+ }
+ });
+ },
+ showMat(tagId) {
+ let that = this
+ // wms绔� 琛ユ帴鍙�
+ // @RequestMapping(value = "/mat/list/pda/page/auth")
+ // @ManagerAuth
+ // public R pdaPageList(@RequestParam(required = true)Long tagId,
+ // @RequestParam(defaultValue = "1")Integer curr,
+ // @RequestParam(defaultValue = "10")Integer limit){
+ // EntityWrapper<Mat> wrapper = new EntityWrapper<>();
+ // wrapper.eq("tag_id", tagId);
+ // wrapper.orderBy("create_time", false);
+ // return R.ok().add(matService.selectPage(new Page<>(curr, limit), wrapper));
+ // }
+ uni.request({
+ url: that.baseUrl + '/order/list/pda/page/auth',
+ data: {
+ curr:that.curr,
+ limit: 100,
+ tagId: tagId
+ },
+ method:"GET",
+ header: {
+ 'token':uni.getStorageSync('token'),
+ },
+ success(result) {
+ that.tagList = null
+ var res = result.data
+ if (res.code === 200) {
+ if (res.data.records != null && res.data.records.length > 0) {
+ let list = res.data.records
+ that.matList = that.reload ? list : that.matList.concat(list);
+ that.curr = that.curr + 1
+ }
+ if (res.data.records.length == 0) {
+ that.status = 'noMore'
+ }
+ that.baColor = "background-color: #1cbbb4;"
+ } 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'})
+ }
+
+ }
+ });
+ },
+ toPrint(item) {
+ let that = this
+ uni.navigateTo({
+ url: "../order/orderDetlList",
+ success: function(res) {
+ // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
+ res.eventChannel.emit('data', {
+ data: item
+ })
+ },
+ events: {
+ // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨�
+ acceptDataFromOpenedPage: function(data) {
+ that.matnr = data.data
+ that.findMat(that.matnr)
+ },
+ },
+
+
+ });
+ }
+ }
+ }
+</script>
+
+<style>
+ @import url('../../static/css/wms.css/wms.css');
+ .tag-list {
+ width: 94%;
+ min-height: 160rpx;
+ margin: 10px auto;
+ background-color: #FFF;
+ border-radius: 5px;
+ box-shadow: 0 5upx 20upx rgba(0, 0, 0, 0.2);
+ }
+ .tag {
+ display: flex;
+ flex-direction: column;
+ min-height: 80rpx;
+ border-bottom: 1px solid #e2e2e2;
+ }
+ .wms-tag {
+ min-width: 60rpx;
+ margin-left: 50rpx;
+ margin-top: 30rpx;
+ color: #FFF;
+ font-size: 14px;
+ padding: 4rpx 12rpx;
+ }
+ .tag-item {
+ width: 100%;
+ min-height: 60rpx;
+ line-height: 2;
+ padding-left: 50rpx;
+ color: #606266;
+ font-size: 14px;
+ }
+</style>
\ No newline at end of file
diff --git a/pages/order/orderList.vue b/pages/order/orderList.vue
new file mode 100644
index 0000000..0f7b99a
--- /dev/null
+++ b/pages/order/orderList.vue
@@ -0,0 +1,215 @@
+<template>
+ <view>
+ <!-- 鎼滅储妗� -->
+ <view class="search-bar">
+ <uni-search-bar placeholder=" 鎵爜 / 杈撳叆" bgColor="#EEEEEE" @confirm="search" />
+ </view>
+ <view>
+ <view class="tag-list" v-for="(item,i) in matList" :key="i" @click="toPrint(item)">
+ <view class="tag">
+ <view style="display: flex;">
+ <view class="wms-tag" :style="baColor" >鍗曟嵁</view>
+ </view>
+ </view>
+ <view class="tag-item">鍗曟嵁鍙凤細 {{item.orderNo}}</view>
+ <view class="tag-item">鍗曟嵁绫诲瀷锛� {{item.docType$}}</view>
+ <view class="tag-item">鍗曟嵁鐘舵�侊細 {{item.settle$}}</view>
+ </view>
+ </view>
+ <uni-load-more v-show="matList.length != 0" :status="status" :icon-size="16" :content-text="contentText" />
+ </view>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+ tagList: [],
+ matList: [],
+ reload: false,
+ curr:1,
+ tag: '鍒嗙被',
+ baColor: "background-color: #0081ff;",
+ desc: '鍟嗗搧缂栧彿:',
+ baseUrl: '',
+ token: '',
+ status: 'more',
+ contentText: {
+ contentdown: '涓婃媺鍔犺浇鏇村',
+ contentrefresh: '鍔犺浇涓�',
+ contentnomore: '娌℃湁鏇村'
+ },
+ // 褰撳墠tagId
+ tagIdNow: 1
+ }
+ },
+ onReachBottom() {
+ this.status = 'more';
+ this.showMat(this.tagIdNow);
+ },
+ onLoad() {
+ // 娌″暐鐢ㄤ簡
+ let that = this
+ // const eventChannel = this.$scope.eventChannel; // 鍏煎APP-NVUE
+ const eventChannel = this.getOpenerEventChannel();
+
+ // 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
+ eventChannel.on('commonUrl', function(data) {
+ that.commonUrl = data.commonUrl
+ })
+ },
+ onShow() {
+ this.baseUrl = uni.getStorageSync('baseUrl');
+ this.token = uni.getStorageSync('token');
+ this.showMat(1)
+ },
+ methods: {
+ search() {
+ },
+ showTag(parentId) {
+ let that = this
+ uni.request({
+ url: that.baseUrl + '/tag/list/pda/auth',
+ header: {
+ 'token':uni.getStorageSync('token'),
+ },
+ data: {
+ limit: 100000,
+ parentId: parentId
+ },
+ header: {
+ 'token':uni.getStorageSync('token'),
+ },
+ success(result) {
+ that.tagList = null
+ that.matList = []
+ var res = result.data
+ if (res.code === 200) {
+ if (res.data != null && res.data.length > 0) {
+ that.tagList = res.data
+ } else {
+ that.showMat(parentId)
+ }
+ that.baColor = "background-color: #0081ff;"
+ } 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'})
+ }
+ }
+ });
+ },
+ showMat(tagId) {
+ let that = this
+ // wms绔� 琛ユ帴鍙�
+ // @RequestMapping(value = "/mat/list/pda/page/auth")
+ // @ManagerAuth
+ // public R pdaPageList(@RequestParam(required = true)Long tagId,
+ // @RequestParam(defaultValue = "1")Integer curr,
+ // @RequestParam(defaultValue = "10")Integer limit){
+ // EntityWrapper<Mat> wrapper = new EntityWrapper<>();
+ // wrapper.eq("tag_id", tagId);
+ // wrapper.orderBy("create_time", false);
+ // return R.ok().add(matService.selectPage(new Page<>(curr, limit), wrapper));
+ // }
+ uni.request({
+ url: that.baseUrl + '/order/list/pda/page/auth',
+ data: {
+ curr:that.curr,
+ limit: 100,
+ tagId: tagId
+ },
+ method:"GET",
+ header: {
+ 'token':uni.getStorageSync('token'),
+ },
+ success(result) {
+ that.tagList = null
+ var res = result.data
+ if (res.code === 200) {
+ if (res.data.records != null && res.data.records.length > 0) {
+ let list = res.data.records
+ that.matList = that.reload ? list : that.matList.concat(list);
+ that.curr = that.curr + 1
+ }
+ if (res.data.records.length == 0) {
+ that.status = 'noMore'
+ }
+ that.baColor = "background-color: #1cbbb4;"
+ } 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'})
+ }
+
+ }
+ });
+ },
+ toPrint(item) {
+ let that = this
+ uni.navigateTo({
+ url: "../order/orderDetlList",
+ success: function(res) {
+ // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
+ res.eventChannel.emit('data', {
+ data: item
+ })
+ },
+ events: {
+ // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨�
+ acceptDataFromOpenedPage: function(data) {
+ that.matnr = data.data
+ that.findMat(that.matnr)
+ },
+ },
+
+
+ });
+ }
+ }
+ }
+</script>
+
+<style>
+ @import url('../../static/css/wms.css/wms.css');
+ .tag-list {
+ width: 94%;
+ min-height: 160rpx;
+ margin: 10px auto;
+ background-color: #FFF;
+ border-radius: 5px;
+ box-shadow: 0 5upx 20upx rgba(0, 0, 0, 0.2);
+ }
+ .tag {
+ display: flex;
+ flex-direction: column;
+ min-height: 80rpx;
+ border-bottom: 1px solid #e2e2e2;
+ }
+ .wms-tag {
+ min-width: 60rpx;
+ margin-left: 50rpx;
+ margin-top: 30rpx;
+ color: #FFF;
+ font-size: 14px;
+ padding: 4rpx 12rpx;
+ }
+ .tag-item {
+ width: 100%;
+ min-height: 60rpx;
+ line-height: 2;
+ padding-left: 50rpx;
+ color: #606266;
+ font-size: 14px;
+ }
+</style>
\ No newline at end of file
diff --git a/pages/order/orderPakin2.vue b/pages/order/orderPakin2.vue
index 938edcf..5b9ed4d 100644
--- a/pages/order/orderPakin2.vue
+++ b/pages/order/orderPakin2.vue
@@ -6,16 +6,14 @@
<view style="flex: 1;">
<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="orderNo" :focus="orderNoFocus">
</view>
- <view style="height:100%;line-height:2;width:40rpx;margin-right: 20rpx;">
- <uni-icons type="clear" color="#c1c1c1" @click="clearOrderNo()"></uni-icons>
- </view>
+
</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="item">
<view class="code-decs">鐗╂枡鐮�:</view>
<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="matnr" :focus="matFocus" @input="findMat()">
<view class="item-right">
@@ -23,7 +21,7 @@
<text style="text-align: right;color: #409EFF;" @click="selectMat()">鎻愬彇+</text>
<uni-icons type="right" color="#c1c1c1"></uni-icons>
</view>
- </view>
+ </view> -->
</view>
<view class="mat-list-title">
鍟嗗搧鍒楄〃
@@ -162,15 +160,22 @@
messageText: '',
title: '',
content: '',
- orderNoFocus: true,
- barcodeFocus: false,
+ orderNoFocus: false,
+ barcodeFocus: true,
matFocus: false,
matData: '',
removeNum: 0,
}
},
onLoad() {
-
+ let that = this
+ const eventChannel = this.getOpenerEventChannel();
+
+ eventChannel.on('orderItem', function(data) {
+ console.log(data.item)
+ that.orderNo = data.item.orderNo
+ that.checkMat(data.item)
+ });
},
onShow() {
this.baseUrl = uni.getStorageSync('baseUrl');
@@ -234,10 +239,12 @@
// 鎼滅储鐗╂枡
findMat() {
let that = this
+ let m = that.matnr.split(";")
+ let matnr1 = m[0].slice(3)
uni.request({
url: that.baseUrl + '/mat/auth',
data: {
- matnr: that.matnr
+ matnr: matnr1
},
header: {
'token': uni.getStorageSync('token')
@@ -493,7 +500,7 @@
.code {
width: 100%;
position: fixed;
- min-height: 210rpx;
+ min-height: 200rpx;
background-color: #FFF;
z-index: 10;
}
@@ -501,7 +508,7 @@
.item {
display: flex;
align-items: center;
- height: 70rpx;
+ height: 100rpx;
margin-left: 20rpx;
border-bottom: 1px solid #DCDFE6;
}
diff --git a/pages/pakin/leftovers.vue b/pages/pakin/leftovers.vue
index cc572fd..4744ca8 100644
--- a/pages/pakin/leftovers.vue
+++ b/pages/pakin/leftovers.vue
@@ -7,9 +7,10 @@
@input="barcodeInput()">
</view>
<view class="item">
- <view class="code-decs">妤煎眰:</view>
- <uni-combox :candidates="floorList" placeholder="璇烽�夋嫨鍑哄簱绔欑偣" v-model="floor"></uni-combox>
- </view>
+ <view class="code-decs">鎷ｆ枡绠�:</view>
+ <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode2" :focus="barcodeFocus2"
+ @input="barcodeInput2()">
+ </view>
<!-- <view class="item">
<view class="code-decs">婊℃墭:</view>
<radio-group @change="isFrozen">
@@ -23,7 +24,7 @@
</view> -->
</view>
- <!-- <scroll-view>
+ <scroll-view>
<view class="list" v-for="(item,i) in dataList" :key="i">
<view class="list-left">
<view class="list-left-item">
@@ -56,7 +57,7 @@
<uni-tag :text="item.weight" type="warning"></uni-tag>
</view>
</view> -->
- <!-- <view class="list-left-item">
+ <view class="list-left-item">
<view class="desc">鏁伴噺锛�</view>
<view class="left-item">{{item.anfme}}</view>
</view>
@@ -66,13 +67,13 @@
<uni-icons type="trash" color="#f58a8a" size="24" @click="remove(item,i,'warn')"></uni-icons>
</view>
</view>
- </scroll-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">
@@ -145,6 +146,7 @@
baseUrl: '',
token: '',
barcode: '',
+ barcode2:'',
dataList: [],
count: 0,
rowNum: '',
@@ -157,6 +159,7 @@
title: '',
content: '',
barcodeFocus: true,
+ barcodeFocus2: true,
matFocus: false,
matData: '',
removeNum: 0,
@@ -197,8 +200,67 @@
this.barcodeFocuss()
return;
}
- this.focuss()
+ this.selectPakinDetlList()
+ // this.focuss()
}, 200)
+ },
+ barcodeInput2() {
+ // 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
+ setTimeout(() => {
+ var len = this.barcode2.length
+ if (len != 8) {
+ uni.showToast({
+ title: '鎵樼洏鐮佹湁璇閲嶈瘯',
+ icon: "none",
+ position: 'top'
+ });
+ this.barcodeFocuss()
+ return;
+ }
+ // this.selectPakinDetlList()
+ // this.focuss()
+ }, 200)
+ },
+ selectPakinDetlList(){
+ let that = this;
+ uni.request({
+ url: that.baseUrl + '/mobile/select/workDetl/barcode',
+ data: JSON.stringify({
+ barcode: that.barcode
+ }),
+ method: 'POST',
+ header: {
+ 'token': uni.getStorageSync('token')
+ },
+ success(result) {
+ result = result.data
+ if (result.code === 200 && result.data) {
+ for(var i =0;i<result.data.length;i++){
+ console.log(result.data[i])
+ that.dataList.push(result.data[i])
+ }
+
+ } 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'
+ })
+ }
+
+ }
+ });
},
// 鎵樼洏鐮佹湁璇噸缃�
barcodeFocuss() {
@@ -207,6 +269,14 @@
setTimeout(() => {
that.barcode = '';
that.barcodeFocus = true;
+ }, 100);
+ },
+ barcodeFocuss2() {
+ let that = this;
+ that.barcodeFocus2 = false;
+ setTimeout(() => {
+ that.barcode2 = '';
+ that.barcodeFocus2 = true;
}, 100);
},
// 鍟嗗搧鍏夋爣娓呯┖閲嶇疆
@@ -231,25 +301,10 @@
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()
- },
- },
- });
+ for(var i =0;i<result.data.length;i++){
+ that.dataList.unshift(result.data[i])
+ }
+
} else if (result.code == 403) {
uni.showToast({
title: result.msg,
@@ -389,16 +444,21 @@
this.messageToggle('error')
return;
}
- if (that.floor === 0 || that.floor === '') {
- this.messageText = "璇烽�夋嫨妤煎眰"
+ if (that.barcode2 === '') {
+ this.messageText = "璇锋壂鎻忔嫞鏂欑鏉＄爜"
this.messageToggle('error')
return;
- }
+ }
+ if (that.dataList.length === 0) {
+ this.messageText = "鎷ｆ枡鍒楄〃涓虹┖"
+ this.messageToggle('error')
+ return;
+ }
uni.request({
url: that.baseUrl + '/mobile/leftovers/out',
data: JSON.stringify({
barcode: that.barcode,
- floor: that.floor
+ barcode2: that.barcode2
}),
method: 'POST',
header: {
diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index 5d5df27..47071fd 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -9,11 +9,11 @@
<view class="item">
<view class="code-decs">鐗╂枡鐮�:</view>
<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="matnr" :focus="matFocus" @input="findMat()">
- <view class="item-right">
+ <!-- <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="item">
<view class="code-decs">婊℃墭:</view>
@@ -224,11 +224,13 @@
},
// 鎼滅储鐗╂枡
findMat() {
- let that = this
+ let that = this
+ let m = that.matnr.split(";")
+ let matnr1 = m[0].slice(3)
uni.request({
url: that.baseUrl + '/mat/auth',
data: {
- matnr: that.matnr
+ matnr: matnr1
},
header: {
'token': uni.getStorageSync('token')
--
Gitblit v1.9.1