From cdad4619cf504f5fe079d735feea680eee3bf6ed Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 22 三月 2024 10:17:36 +0800
Subject: [PATCH] #
---
pages/phyz/AGV/AGVPakin2.vue | 26 +++-
pages/phyz/order/orderList.vue | 34 +++++-
pages/phyz/AGV/AGVPakin.vue | 6
pages/home/orderManage.vue | 204 ++++++++++++++++++++++++++++++++++++++++
static/css/wms.css/wms.css | 2
5 files changed, 251 insertions(+), 21 deletions(-)
diff --git a/pages/home/orderManage.vue b/pages/home/orderManage.vue
index 8183fd0..b7de376 100644
--- a/pages/home/orderManage.vue
+++ b/pages/home/orderManage.vue
@@ -1,6 +1,17 @@
<template>
<view>
-
+ <scroll-view scroll-y class="page">
+ <view class="nav-list">
+ <navigator hover-class='none' :url="'/pages' + item.url" class="nav-li" navigateTo
+ :class="'bg-'+item.color" :style="[{animation: 'show ' + ((index+1)*0.2+1) + 's 1'}]"
+ v-for="(item,index) in elements" :key="index">
+ <view class="nav-title">{{item.title}}</view>
+ <view class="nav-name">{{item.name}}</view>
+ <text :class="'cuIcon-' + item.cuIcon"></text>
+ </navigator>
+ </view>
+ <view class="cu-tabbar-height"></view>
+ </scroll-view>
</view>
</template>
@@ -8,15 +19,200 @@
export default {
data() {
return {
-
- }
+ baseUrl: '',
+ token: '',
+ icon: '',
+ elements: [],
+ project: 'tzsk',
+ elements2: [
+ {
+ title: '閲囪喘鍏ュ簱鍗�',
+ name: 'pakin',
+ color: 'blue',
+ // cuIcon: 'pullup',
+ url: `/phyz/order/purchaseOrder`
+ },
+ ],
+ colorList: ['cyan','blue','purple','mauve','pink','brown','red','orange','yellow','olive','olive','grey' ]
+ };
+ },
+ onShow() {
+ this.baseUrl = uni.getStorageSync('baseUrl');
+ this.token = uni.getStorageSync('token');
+ this.project = uni.getStorageSync('project')
+ this.getAuth()
+ this.backGroundRepeat()
},
methods: {
-
+ backGroundRepeat() {
+ let len = this.colorList.length
+ let i = 0
+ for (let k in this.elements2) {
+ if (i == len) {
+ i = 0
+ }
+ this.elements2[k].color = this.colorList[i]
+ i++
+ }
+ },
+ getAuth() {
+ let that = this
+ uni.request({
+ url: that.baseUrl + '/menu/pda/auth',
+ data: {},
+ header: { 'token': uni.getStorageSync('token') },
+ method: 'POST',
+ success(res) {
+ console.log(res);
+ if (res.statusCode === 404) {
+ that.elements = that.elements2
+ return
+ }
+ res = res.data
+ that.elements = []
+ if (res.code === 200) {
+ if (res.data == undefined || res.data == null || res.data == "") {
+ that.elements = that.elements2
+ return
+ }
+ for (var i = 0; i < res.data.length; i++) {
+ if (res.data.length < 0) {
+ break;
+ }
+ that.getIcon(res.data[i].title)
+ that.elements.unshift({
+ title: res.data[i].name,
+ name: res.data[i].title,
+ color: that.colorList[i],
+ cuIcon: that.icon,
+ url: `/${that.project}${res.data[i].action}`
+ })
+ }
+ that.elements.push({
+ title: '閫�鍑虹櫥褰�',
+ name: 'logOut',
+ color: 'grey',
+ cuIcon: 'exit',
+ url: '/login/logOut'
+ })
+ } else if (res.code === 403) {
+ uni.showToast({
+ title: res.msg,
+ icon: "none",
+ position: 'top'
+ })
+ setTimeout(() => {
+ uni.reLaunch({
+ url: '../login/login'
+ });
+ }, 1000);
+ } else if(res.status === 404) {
+ that.elements = that.elements2
+ // uni.showToast({
+ // title: '榛樿涓婚〉',
+ // icon: "none",
+ // position: 'top'
+ // })
+ } else {
+ uni.showToast({
+ title: res.msg,
+ icon: "none",
+ position: 'top'
+ })
+ }
+ },
+ fail(err) {
+ console.log(err);
+ }
+ })
+ },
+ getIcon(e) {
+ const ways = ['pakin','orderPakin','orderPutOn']
+ if (ways.includes(e)) {
+ this.icon = 'pullup'
+ }
+ }
}
}
</script>
<style>
+ .page {
+ height: 100vh;
+ }
+ .bg-red {
+ background-color: #e54d42;
+ color: #ffffff;
+ }
+
+ .bg-orange {
+ background-color: #f37b1d;
+ color: #ffffff;
+ }
+
+ .bg-yellow {
+ background-color: #fbbd08;
+ color: #333333;
+ }
+
+ .bg-olive {
+ background-color: #8dc63f;
+ color: #ffffff;
+ }
+
+ .bg-green {
+ background-color: #39b54a;
+ color: #ffffff;
+ }
+
+ .bg-cyan {
+ background-color: #1cbbb4;
+ color: #ffffff;
+ }
+
+ .bg-blue {
+ background-color: #0081ff;
+ color: #ffffff;
+ }
+
+ .bg-purple {
+ background-color: #6739b6;
+ color: #ffffff;
+ }
+
+ .bg-mauve {
+ background-color: #9c26b0;
+ color: #ffffff;
+ }
+
+ .bg-pink {
+ background-color: #e03997;
+ color: #ffffff;
+ }
+
+ .bg-brown {
+ background-color: #a5673f;
+ color: #ffffff;
+ }
+
+ .bg-grey {
+ background-color: #8799a3;
+ color: #ffffff;
+ }
+
+ .bg-gray {
+ background-color: #f0f0f0;
+ color: #333333;
+ }
+
+ .bg-black {
+ background-color: #333333;
+ color: #ffffff;
+ }
+
+ .bg-white {
+ background-color: #ffffff;
+ color: #666666;
+ }
</style>
diff --git a/pages/phyz/AGV/AGVPakin.vue b/pages/phyz/AGV/AGVPakin.vue
index bb5f8b1..dd3627d 100644
--- a/pages/phyz/AGV/AGVPakin.vue
+++ b/pages/phyz/AGV/AGVPakin.vue
@@ -3,7 +3,7 @@
<view class="code">
<view class="item">
<input type="text" placeholder=" 鎵爜 / 杈撳叆 璁㈠崟鍙�" v-model="orderNo" :focus="orderNoFocus"
- @input="findOrder()">
+ @input="findOrder()" disabled>
</view>
<view class="item">
<input type="text" placeholder=" 鎵爜 / 杈撳叆 璐ф灦鐮�" v-model="barcode" :focus="barcodeFocus"
@@ -181,8 +181,8 @@
messageText: '',
title: '',
content: '',
- orderNoFocus: true,
- barcodeFocus: false,
+ orderNoFocus: false,
+ barcodeFocus: true,
matFocus: false,
matData: '',
removeNum: 0,
diff --git a/pages/phyz/AGV/AGVPakin2.vue b/pages/phyz/AGV/AGVPakin2.vue
index bb5f8b1..c368d4f 100644
--- a/pages/phyz/AGV/AGVPakin2.vue
+++ b/pages/phyz/AGV/AGVPakin2.vue
@@ -3,20 +3,20 @@
<view class="code">
<view class="item">
<input type="text" placeholder=" 鎵爜 / 杈撳叆 璁㈠崟鍙�" v-model="orderNo" :focus="orderNoFocus"
- @input="findOrder()">
+ @input="findOrder()" disabled>
</view>
<view class="item">
<input type="text" placeholder=" 鎵爜 / 杈撳叆 璐ф灦鐮�" v-model="barcode" :focus="barcodeFocus"
@input="barcodeInput()">
</view>
- <view class="item">
+ <!-- <view class="item">
<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>
<view class="mat-list-title">
鍟嗗搧鍒楄〃
@@ -181,8 +181,8 @@
messageText: '',
title: '',
content: '',
- orderNoFocus: true,
- barcodeFocus: false,
+ orderNoFocus: false,
+ barcodeFocus: true,
matFocus: false,
matData: '',
removeNum: 0,
@@ -201,6 +201,16 @@
}
},20)
// #endif
+ let that = this
+ // const eventChannel = this.$scope.eventChannel; // 鍏煎APP-NVUE
+ const eventChannel = this.getOpenerEventChannel();
+
+ // 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
+ eventChannel.on('mats', function(data) {
+ console.log(data);
+ that.orderNo = data.mats[0].orderNo
+ that.dataList = data.mats
+ })
},
onBackPress() {
this.hide = false
@@ -600,12 +610,12 @@
}
.list:first-child {
- margin-top: 340rpx;
+ margin-top: 270rpx;
}
.code {
width: 100%;
position: fixed;
- min-height: 200rpx;
+ min-height: 100rpx;
background-color: #FFF;
z-index: 10;
}
@@ -638,7 +648,7 @@
width: 100%;
background-color: white;
position: fixed;
- margin-top: 210rpx;
+ margin-top: 140rpx;
z-index: 9;
/* border-top: 1px solid #DCDFE6; */
text-align: center;
diff --git a/pages/phyz/order/orderList.vue b/pages/phyz/order/orderList.vue
index 4f2d219..3c3ce58 100644
--- a/pages/phyz/order/orderList.vue
+++ b/pages/phyz/order/orderList.vue
@@ -56,6 +56,8 @@
},
onLoad() {
let that = this
+ this.baseUrl = uni.getStorageSync('baseUrl');
+ this.token = uni.getStorageSync('token');
// const eventChannel = this.$scope.eventChannel; // 鍏煎APP-NVUE
const eventChannel = this.getOpenerEventChannel();
@@ -63,24 +65,26 @@
eventChannel.on('item', function(data) {
console.log(data);
that.orderId = data.item.orderId
+ console.log(data.item.id);
uni.setNavigationBarTitle({
- title: data.item.orderNo
+ title: data.item.orderNo,
+
})
+ that.getOrderDetl(data.item.id)
})
},
onShow() {
- this.baseUrl = uni.getStorageSync('baseUrl');
- this.token = uni.getStorageSync('token');
if (this.dataList.length > 0) {
this.oldDataList = [...this.dataList]
}
- this.getOrderDetl(this.orderId)
+ // this.getOrderDetl(this.orderId)
},
methods: {
// 璁㈠崟鏄庣粏
getOrderDetl(id) {
let _this = this
+ console.log(id);
uni.request({
url: `${_this.baseUrl}/orderDetl/list/auth`,
header: {'token': uni.getStorageSync('token')},
@@ -161,7 +165,27 @@
this.dataList = [...this.oldDataList]
},
combConfirm(type) {
-
+ let _this = this
+ let combList = []
+ for (let k of _this.dataList) {
+ if (k.checked) {
+ combList.push(k)
+ }
+ }
+ if (combList.length == 0) {
+ uni.showToast({ title: '璇烽�夋嫨缁勬墭鍟嗗搧', icon: "error", position: 'top'
+ })
+ return
+ }
+ uni.navigateTo({
+ url: "../AGV/AGVPakin2",
+ success: function(res) {
+ // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
+ res.eventChannel.emit('mats', {
+ mats: combList
+ })
+ },
+ });
},
}
}
diff --git a/static/css/wms.css/wms.css b/static/css/wms.css/wms.css
index 6c529ab..ad6e288 100644
--- a/static/css/wms.css/wms.css
+++ b/static/css/wms.css/wms.css
@@ -8,7 +8,7 @@
box-shadow: 0px 0px 30px 0px rgba(0,0,0,0.2);
}
.list:first-child {
- margin-top: 420rpx;
+ margin-top: 340rpx;
}
.list:last-child {
margin-bottom: 120rpx;
--
Gitblit v1.9.1