From 55d6fd6841e1564e3b696d3e57b2765c9329fd45 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 03 四月 2024 14:56:04 +0800
Subject: [PATCH] #
---
pages/phyz/order/orderList.vue | 1
pages/phyz/order/purchaseOrder.vue | 8 ++
pages/phyz/wrkMast/waitPakinLog.vue | 22 +++++++
pages.json | 18 ++++++
pages/phyz/stationManage/stationManage.vue | 17 ++++-
pages/home/inOutManage.vue | 70 +++++++++++-----------
pages/phyz/wrkMast/wrkMastLog.vue | 22 +++++++
7 files changed, 120 insertions(+), 38 deletions(-)
diff --git a/pages.json b/pages.json
index d98101b..3a5f4e0 100644
--- a/pages.json
+++ b/pages.json
@@ -535,6 +535,24 @@
}
}
+ ,{
+ "path" : "pages/phyz/wrkMast/wrkMastLog",
+ "style" :
+ {
+ "navigationBarTitleText": "宸ヤ綔鍘嗗彶妗�",
+ "enablePullDownRefresh": false
+ }
+
+ }
+ ,{
+ "path" : "pages/phyz/wrkMast/waitPakinLog",
+ "style" :
+ {
+ "navigationBarTitleText": "鍏ュ簱閫氱煡鍘嗗彶妗�",
+ "enablePullDownRefresh": false
+ }
+
+ }
],
"globalStyle": {
"navigationBarTextStyle": "black",
diff --git a/pages/home/inOutManage.vue b/pages/home/inOutManage.vue
index cba0e9e..b84962e 100644
--- a/pages/home/inOutManage.vue
+++ b/pages/home/inOutManage.vue
@@ -39,13 +39,13 @@
// cuIcon: 'pullup',
url: `/phyz/AGV/emptyOut`
},
- {
- title: '缁勬墭',
- name: 'pakin',
- color: 'blue',
- // cuIcon: 'pullup',
- url: `/phyz/AGV/AGVPakin`
- },
+ // {
+ // title: '缁勬墭',
+ // name: 'pakin',
+ // color: 'blue',
+ // // cuIcon: 'pullup',
+ // url: `/phyz/AGV/AGVPakin`
+ // },
{
title: 'AGV涓婃灦缁戝畾',
@@ -54,34 +54,34 @@
// cuIcon: 'pullup',
url: '/tzsk/AGV/AGVPakinBing'
},
- {
- title: 'AGV鍚姩鍏ュ簱',
- name: 'AGVStart',
- color: 'pink',
- // cuIcon: 'pullup',
- url: '/tzsk/AGV/AGVStart'
- },
- {
- title: 'AGV涓婃灦缁勬墭',
- name: 'AGVPakinOn',
- color: 'brown',
- // cuIcon: 'pullup',
- url: '/tzsk/AGV/AGVPakinOn'
- },
- {
- title: 'AGV瀹瑰櫒绂诲満',
- name: 'AGVContainerMove',
- color: 'cyan',
- // cuIcon: 'pullup',
- url: '/tzsk/AGV/AGVContainerMove'
- },
- {
- title: 'AGV鏉＄爜',
- name: 'AGVCode',
- color: 'cyan',
- // cuIcon: 'pullup',
- url: '/tzsk/AGV/AGVCode'
- },
+ // {
+ // title: 'AGV鍚姩鍏ュ簱',
+ // name: 'AGVStart',
+ // color: 'pink',
+ // // cuIcon: 'pullup',
+ // url: '/tzsk/AGV/AGVStart'
+ // },
+ // {
+ // title: 'AGV涓婃灦缁勬墭',
+ // name: 'AGVPakinOn',
+ // color: 'brown',
+ // // cuIcon: 'pullup',
+ // url: '/tzsk/AGV/AGVPakinOn'
+ // },
+ // {
+ // title: 'AGV瀹瑰櫒绂诲満',
+ // name: 'AGVContainerMove',
+ // color: 'cyan',
+ // // cuIcon: 'pullup',
+ // url: '/tzsk/AGV/AGVContainerMove'
+ // },
+ // {
+ // title: 'AGV鏉＄爜',
+ // name: 'AGVCode',
+ // color: 'cyan',
+ // // cuIcon: 'pullup',
+ // url: '/tzsk/AGV/AGVCode'
+ // },
],
colorList: ['cyan','blue','purple','mauve','pink','brown','red','orange','yellow','olive','olive','grey' ]
};
diff --git a/pages/phyz/order/orderList.vue b/pages/phyz/order/orderList.vue
index 92db836..fba7117 100644
--- a/pages/phyz/order/orderList.vue
+++ b/pages/phyz/order/orderList.vue
@@ -197,6 +197,7 @@
let _this = this
let combList = []
for (let k of _this.dataList) {
+ k['csocode'] = k.threeCode
if (k.checked) {
combList.push(k)
}
diff --git a/pages/phyz/order/purchaseOrder.vue b/pages/phyz/order/purchaseOrder.vue
index 2aed4e8..2fb6a42 100644
--- a/pages/phyz/order/purchaseOrder.vue
+++ b/pages/phyz/order/purchaseOrder.vue
@@ -31,6 +31,11 @@
</view>
</view>
<view style="height: 100rpx;"></view>
+
+ <view style="position: fixed;bottom: 40px;padding: 10rpx;border-radius: 50%;
+ left: 20px;background-color: #55aaff;box-shadow: 0px 0px 5px 5px #c8c8c8;">
+ <uni-icons type="refreshempty" size="30" color="#FFF" @click="reload()"/>
+ </view>
</view>
</template>
@@ -57,6 +62,9 @@
},
methods: {
+ reload() {
+ this.getOrderList()
+ },
searchValueInput() {
let count = 0
let sign = 0
diff --git a/pages/phyz/stationManage/stationManage.vue b/pages/phyz/stationManage/stationManage.vue
index e1e6d04..6478660 100644
--- a/pages/phyz/stationManage/stationManage.vue
+++ b/pages/phyz/stationManage/stationManage.vue
@@ -231,7 +231,11 @@
if (res.code === 200) {
_this.searchValue = ''
setTimeout(()=> {
- _this.getBasDevp()
+ _this.searchValue = ''
+ _this.station = ''
+ _this.wrkMast = ''
+ _this.wrkDetls = []
+ _this.waitPakins = []
},100)
} else {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
@@ -257,7 +261,11 @@
if (res.code === 200) {
_this.searchValue = ''
setTimeout(()=> {
- _this.getBasDevp()
+ _this.searchValue = ''
+ _this.station = ''
+ _this.wrkMast = ''
+ _this.wrkDetls = []
+ _this.waitPakins = []
},100)
} else {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
@@ -296,7 +304,10 @@
if (res.code === 200) {
setTimeout(()=> {
that.searchValue = ''
- that.getBasDevp()
+ that.station = ''
+ that.wrkMast = ''
+ that.wrkDetls = []
+ that.waitPakins = []
},300)
uni.showToast({
title: res.msg,
diff --git a/pages/phyz/wrkMast/waitPakinLog.vue b/pages/phyz/wrkMast/waitPakinLog.vue
new file mode 100644
index 0000000..8183fd0
--- /dev/null
+++ b/pages/phyz/wrkMast/waitPakinLog.vue
@@ -0,0 +1,22 @@
+<template>
+ <view>
+
+ </view>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+
+ }
+ },
+ methods: {
+
+ }
+ }
+</script>
+
+<style>
+
+</style>
diff --git a/pages/phyz/wrkMast/wrkMastLog.vue b/pages/phyz/wrkMast/wrkMastLog.vue
new file mode 100644
index 0000000..8183fd0
--- /dev/null
+++ b/pages/phyz/wrkMast/wrkMastLog.vue
@@ -0,0 +1,22 @@
+<template>
+ <view>
+
+ </view>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+
+ }
+ },
+ methods: {
+
+ }
+ }
+</script>
+
+<style>
+
+</style>
--
Gitblit v1.9.1